Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't try to parse MSRV if feature is not enabled #9115

Merged
merged 1 commit into from
Jan 30, 2021
Merged

Don't try to parse MSRV if feature is not enabled #9115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 25 additions & 22 deletions src/cargo/util/toml/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ impl TomlManifest {
Edition::Edition2015
};

if let Some(rust_version) = &project.rust_version {
let rust_version = if let Some(rust_version) = &project.rust_version {
if features.require(Feature::rust_version()).is_err() {
let mut msg =
"`rust-version` is not supported on this version of Cargo and will be ignored"
Expand All @@ -1077,28 +1077,31 @@ impl TomlManifest {
);
}
warnings.push(msg);
}

let req = match semver::VersionReq::parse(rust_version) {
// Exclude semver operators like `^` and pre-release identifiers
Ok(req) if rust_version.chars().all(|c| c.is_ascii_digit() || c == '.') => req,
_ => bail!("`rust-version` must be a value like \"1.32\""),
};

if let Some(first_version) = edition.first_version() {
let unsupported =
semver::Version::new(first_version.major, first_version.minor - 1, 9999);
if req.matches(&unsupported) {
bail!(
"rust-version {} is older than first version ({}) required by \
the specified edition ({})",
rust_version,
first_version,
edition,
)
None
} else {
let req = match semver::VersionReq::parse(rust_version) {
// Exclude semver operators like `^` and pre-release identifiers
Ok(req) if rust_version.chars().all(|c| c.is_ascii_digit() || c == '.') => req,
_ => bail!("`rust-version` must be a value like \"1.32\""),
};
if let Some(first_version) = edition.first_version() {
let unsupported =
semver::Version::new(first_version.major, first_version.minor - 1, 9999);
if req.matches(&unsupported) {
bail!(
"rust-version {} is older than first version ({}) required by \
the specified edition ({})",
rust_version,
first_version,
edition,
)
}
}
Some(rust_version.clone())
}
}
} else {
None
};

if project.metabuild.is_some() {
features.require(Feature::metabuild())?;
Expand Down Expand Up @@ -1339,7 +1342,7 @@ impl TomlManifest {
workspace_config,
features,
edition,
project.rust_version.clone(),
rust_version,
project.im_a_teapot,
project.default_run.clone(),
Rc::clone(me),
Expand Down
4 changes: 2 additions & 2 deletions tests/testsuite/rust_version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fn rust_version_gated() {
[package]
name = "foo"
version = "0.0.1"
rust-version = "1.17"
rust-version = "1.9999"
"#,
)
.file("src/lib.rs", "")
Expand All @@ -31,7 +31,7 @@ fn rust_version_gated() {
[package]
name = "foo"
version = "0.0.1"
rust-version = "1.17"
rust-version = "1.9999"
"#,
)
.file("src/lib.rs", "")
Expand Down