development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-09-13 21:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(toml): Decouple rust-version reading from edition validation

Browse source
This commit is contained in:
Ed Page 2024-02-29 14:21:36 -06:00
parent 0f9d4a352a
commit 1d3d4a788d
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/cargo/util/toml/mod.rs
View file

@ -597,6 +597,12 @@ pub fn to_real_manifest(
let rust_version = field_inherit_with(rust_version.clone(), "rust_version", || {
inherit()?.rust_version()
})?;
Some(rust_version)
} else {
None
};
if let Some(rust_version) = &rust_version {
let req = rust_version.to_caret_req();
if let Some(first_version) = edition.first_version() {
let unsupported =
@ -611,10 +617,7 @@ pub fn to_real_manifest(
)
}
}
Some(rust_version)
} else {
None
};
}
if package.metabuild.is_some() {
features.require(Feature::metabuild())?;