Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 26 additions & 64 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ env_logger = "0.11"
globwalk = "0.9.1"
anyhow = "1.0.102"
pathdiff = "0.2.3"
cargo-manifest = "0.20.0"
cargo-manifest = "0.21.0"
fs-err = "3.3.0"
toml = { version = "1.0", features = ["preserve_order"] }
toml = { version = "1.1", features = ["preserve_order"] }
expect-test = "1.5.1"
guppy = "0.17"

Expand Down
67 changes: 67 additions & 0 deletions tests/skeletons/tests/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -461,3 +461,70 @@ workspace = true
}
}
}

#[test]
pub fn test_toml_v1_1() {
// Arrange
let project = CargoWorkspace::new()
.manifest(
".",
r#"
[package]
name = "test-dummy"
version = "0.1.0"
edition = "2018"

[dependencies]
reqwest = {
version = "0.13",
default-features = false,
features = [
"json",
]
}

"#,
)
.touch("src/main.rs")
.build();

// Act
let skeleton = Skeleton::derive(project.path(), None).unwrap();

// Assert
assert_eq!(1, skeleton.manifests.len());

let manifest = &skeleton.manifests[0];
let parsed: toml::Value = toml::from_str(&manifest.contents).unwrap();

let reqwest = parsed
.get("dependencies")
.and_then(|deps| deps.get("reqwest"))
.expect("Expected to find reqwest dependency in manifest")
.as_table()
.expect("Expected reqwest dependency to be a table");
assert_eq!(
reqwest.get("version").and_then(|v| v.as_str()),
Some("0.13"),
"Expected reqwest version to be '0.13' (TOML 1.1 multiline inline table)"
);

assert_eq!(
reqwest.get("default-features").and_then(|v| v.as_bool()),
Some(false),
"Expected reqwest default-features to be false"
);

let features = reqwest
.get("features")
.expect("Expected to find features in reqwest dependency")
.as_array()
.expect("Expected features to be an array");

let feature_names: Vec<&str> = features.iter().filter_map(|f| f.as_str()).collect();
assert_eq!(
feature_names,
vec!["json"],
"Expected features to contain exactly 'json' from TOML 1.1 multiline inline table"
);
}
Loading