Skip to content

Commit cdf6915

Browse files
committed
Auto merge of #2990 - jtgeibel:update/semver, r=pietroalbini
Update to the latest semver The new release of semver treats `>= 0` the same as the `*` wildcard. It makes sense that these are equivalent, but this did break 3 tests and will technically reject syntax in `Cargo.toml` that was previously accepted. r? `@ghost`
2 parents 6e7b63a + 4819d90 commit cdf6915

File tree

5 files changed

+18
-8
lines changed

5 files changed

+18
-8
lines changed

Cargo.lock

Lines changed: 14 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ parse_link_header = "0.2.0"
7575
rand = "0.7"
7676
reqwest = { version = "0.10", features = ["blocking", "gzip", "json"] }
7777
scheduled-thread-pool = "0.2.0"
78-
semver = { version = "0.10", features = ["diesel", "serde"] }
78+
semver = { version = "0.11", features = ["diesel", "serde"] }
7979
sentry = "0.21.0"
8080
serde = { version = "1.0.0", features = ["derive"] }
8181
serde_json = "1.0.0"

src/models/dependency.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub fn add_dependencies(
9292
.map_err(|_| cargo_err(&format_args!("no known crate named `{}`", &*dep.name)))?;
9393
if dep.version_req == semver::VersionReq::parse("*").unwrap() {
9494
return Err(cargo_err(
95-
"wildcard (`*`) dependency constraints are not allowed \
95+
"wildcard (`*` or `>= 0`) dependency constraints are not allowed \
9696
on crates.io. See https://doc.rust-lang.org/cargo/faq.html#can-\
9797
libraries-use--as-a-version-for-their-dependencies for more \
9898
information",

src/tests/all.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ fn bad_resp(r: &mut AppResponse) -> Option<Bad> {
190190
Some(bad)
191191
}
192192

193+
#[track_caller]
193194
fn json<T>(r: &mut AppResponse) -> T
194195
where
195196
for<'de> T: serde::Deserialize<'de>,

src/tests/builders/dependency.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ impl DependencyBuilder {
1515
explicit_name_in_toml: None,
1616
name: name.to_string(),
1717
registry: None,
18-
version_req: u::EncodableCrateVersionReq(semver::VersionReq::parse(">= 0").unwrap()),
18+
version_req: u::EncodableCrateVersionReq(semver::VersionReq::parse("> 0").unwrap()),
1919
}
2020
}
2121

0 commit comments

Comments
 (0)