Skip to content

Commit a78bba7

Browse files
committed
fix(manifest): Improve error on good pre-release
1 parent 9fb8128 commit a78bba7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/cargo/util/semver_ext.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ impl std::str::FromStr for PartialVersion {
142142
let version_req = match semver::VersionReq::parse(value) {
143143
// Exclude semver operators like `^` and pre-release identifiers
144144
Ok(req) if value.chars().all(|c| c.is_ascii_digit() || c == '.') => req,
145-
Err(_) if value.contains('+') => {
145+
_ if value.contains('+') => {
146146
anyhow::bail!("unexpected build field, expected a version like \"1.32\"")
147147
}
148-
Err(_) if value.contains('-') => {
148+
_ if value.contains('-') => {
149149
anyhow::bail!("unexpected prerelease field, expected a version like \"1.32\"")
150150
}
151151
_ => anyhow::bail!("expected a version like \"1.32\""),

tests/testsuite/rust_version.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Caused by:
8585
|
8686
6 | rust-version = \"1.43.0-beta.1\"
8787
| ^^^^^^^^^^^^^^^
88-
expected a version like \"1.32\"",
88+
unexpected prerelease field, expected a version like \"1.32\"",
8989
)
9090
.run();
9191
}

0 commit comments

Comments
 (0)