Skip to content

Commit c0ed70e

Browse files
committed
Use semver::Version's cmp_precedence for deciding what is downgrade
1 parent 985e1ee commit c0ed70e

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

Cargo.lock

Lines changed: 2 additions & 2 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
@@ -76,7 +76,7 @@ rand = "0.8.5"
7676
rustfix = "0.6.1"
7777
same-file = "1.0.6"
7878
security-framework = "2.9.2"
79-
semver = { version = "1.0.19", features = ["serde"] }
79+
semver = { version = "1.0.20", features = ["serde"] }
8080
serde = "1.0.188"
8181
serde-untagged = "0.1.1"
8282
serde-value = "0.7.0"

src/cargo/ops/cargo_generate_lockfile.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::util::config::Config;
88
use crate::util::style;
99
use crate::util::CargoResult;
1010
use anstyle::Style;
11+
use std::cmp::Ordering;
1112
use std::collections::{BTreeMap, HashSet};
1213
use tracing::debug;
1314

@@ -156,11 +157,7 @@ pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoRes
156157
// regardless of whether the build metadata has gone up or down.
157158
// This metadata is often stuff like git commit hashes, which are
158159
// not meaningfully ordered.
159-
let removed = removed[0].version();
160-
let added = added[0].version();
161-
if (removed.major, removed.minor, removed.patch, &removed.pre)
162-
> (added.major, added.minor, added.patch, &added.pre)
163-
{
160+
if removed[0].version().cmp_precedence(added[0].version()) == Ordering::Greater {
164161
print_change("Downgrading", msg, &style::WARN)?;
165162
} else {
166163
print_change("Updating", msg, &style::GOOD)?;

0 commit comments

Comments
 (0)