Skip to content

Commit 1d3d4a7

Browse files
committed
refactor(toml): Decouple rust-version reading from edition validation
1 parent 0f9d4a3 commit 1d3d4a7

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/cargo/util/toml/mod.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,12 @@ pub fn to_real_manifest(
597597
let rust_version = field_inherit_with(rust_version.clone(), "rust_version", || {
598598
inherit()?.rust_version()
599599
})?;
600+
Some(rust_version)
601+
} else {
602+
None
603+
};
604+
605+
if let Some(rust_version) = &rust_version {
600606
let req = rust_version.to_caret_req();
601607
if let Some(first_version) = edition.first_version() {
602608
let unsupported =
@@ -611,10 +617,7 @@ pub fn to_real_manifest(
611617
)
612618
}
613619
}
614-
Some(rust_version)
615-
} else {
616-
None
617-
};
620+
}
618621

619622
if package.metabuild.is_some() {
620623
features.require(Feature::metabuild())?;

0 commit comments

Comments
 (0)