Skip to content

Commit 0d83e4e

Browse files
committed
Auto merge of #3653 - Turbo87:semver, r=jtgeibel
Update `semver` to v1.x This PR updates the `semver` crate to the new v1.0.0 release, which is basically a complete rewrite. The `diesel` feature no longer exists, but due to #3650 we don't need it anymore. Closes #3338
2 parents ec4bdc0 + d1f2826 commit 0d83e4e

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

Cargo.lock

Lines changed: 7 additions & 9 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
@@ -73,7 +73,7 @@ prometheus = "0.12.0"
7373
rand = "0.8"
7474
reqwest = { version = "0.11", features = ["blocking", "gzip", "json"] }
7575
scheduled-thread-pool = "0.2.0"
76-
semver = { version = "0.10", features = ["diesel", "serde"] }
76+
semver = { version = "1.0.3", features = ["serde"] }
7777
sentry = "0.22"
7878
serde = { version = "1.0.0", features = ["derive"] }
7979
serde_json = "1.0.0"

src/controllers/krate/publish.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,11 @@ pub fn add_dependencies(
303303
let krate:Crate = Crate::by_exact_name(&dep.name)
304304
.first(&*conn)
305305
.map_err(|_| cargo_err(&format_args!("no known crate named `{}`", &*dep.name)))?;
306-
if semver::VersionReq::parse(&dep.version_req.0) == semver::VersionReq::parse("*") {
307-
return Err(cargo_err(WILDCARD_ERROR_MESSAGE));
306+
307+
if let Ok(version_req) = semver::VersionReq::parse(&dep.version_req.0) {
308+
if version_req == semver::VersionReq::STAR {
309+
return Err(cargo_err(WILDCARD_ERROR_MESSAGE));
310+
}
308311
}
309312

310313
// If this dependency has an explicit name in `Cargo.toml` that

src/models/version.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl TopVersions {
7676
let highest_stable = pairs
7777
.iter()
7878
.map(|(_, v)| v)
79-
.filter(|v| !v.is_prerelease())
79+
.filter(|v| v.pre.is_empty())
8080
.max()
8181
.map(|v| v.clone());
8282

0 commit comments

Comments
 (0)