8000 github: actually make version comparison total order by figsoda · Pull Request #726 · nix-community/nix-init · GitHub
[go: up one dir, main page]
Skip to content

github: actually make version comparison total order #726

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

Merged
figsoda merged 1 commit into from
Feb 17, 2026
Merged

github: actually make version comparison total order #726

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
29 changes: 21 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ serde_yaml = "0.9.34"
shlex = "1.3.0"
spdx = "0.13.3"
tar = "0.4.44"
version-compare = "0.2.1"
tempfile = "3.25.0"
time = { version = "0.3.47", features = ["parsing", "serde"] }
tracing = "0.1.44"
tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
url = "2.5.8"
versions = "7.0.0"
which = "8.0.0"
xdg = "3.0.0"
zip = "8.0.0"
Expand Down
21 changes: 6 additions & 15 deletions src/fetcher/github.rs
View file
Open in desktop
46D2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use reqwest::{Client, header::HeaderMap};
use rustc_hash::FxHashMap;
use rustyline::completion::Pair;
use serde::Deserialize;
use version_compare::Cmp;
use versions::Versioning;

use crate::{
cfg::AccessTokens,
Expand Down Expand Up @@ -107,20 +107,11 @@ impl Fetcher for FetchFromGitHub {
.filter_map(|Reference { reference }| {
reference.strip_prefix("refs/tags/").map(ToOwned::to_owned)
})
.sorted_unstable_by(|x, y| {
match (
&version_compare::Version::from(x),
&version_compare::Version::from(y),
) {
(Some(x), Some(y)) => match y.compare(x) {
Cmp::Lt => Ordering::Less,
Cmp::Gt => Ordering::Greater,
_ => y.as_str().cmp(x.as_str()),
},
(Some(_), None) => Ordering::Less,
(None, Some(_)) => Ordering::Greater,
(None, None) => y.cmp(x),
}
.sorted_unstable_by(|x, y| match (&Versioning::new(x), &Versioning::new(y)) {
(Some(x), Some(y)) => y.cmp(x),
(Some(_), None) => Ordering::Less,
(None, Some(_)) => Ordering::Greater,
(None, None) => y.cmp(x),
})
.take(12);

Expand Down
0