Skip to content
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.

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

Clearer registry Python sort #7178

Merged
merged 1 commit into from
Sep 7, 2024
Merged
Changes from all commits
Commits
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
22 changes: 12 additions & 10 deletions crates/uv-python/src/py_launcher.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use crate::PythonVersion;
use std::cmp::Ordering;
use std::path::PathBuf;
use std::str::FromStr;
use tracing::debug;
Expand Down Expand Up @@ -52,16 +53,17 @@ pub(crate) fn registry_pythons() -> Result<Vec<WindowsPython>, windows_result::E

// The registry has no natural ordering, so we're processing the latest version first.
registry_pythons.sort_by(|a, b| {
// Highest version first (reverse), but entries without version at the bottom (regular
// order).
if let (Some(version_a), Some(version_b)) = (&a.version, &b.version) {
version_a.cmp(version_b).reverse().then(a.path.cmp(&b.path))
} else {
a.version
.as_ref()
.map(|version| &***version)
.cmp(&b.version.as_ref().map(|version| &***version))
.then(a.path.cmp(&b.path))
match (&a.version, &b.version) {
// Place entries with a version before those without a version.
(Some(_), None) => Ordering::Greater,
(None, Some(_)) => Ordering::Less,
// We want the highest version on top, which is the inverse from the regular order. The
// path is an arbitrary but stable tie-breaker.
(Some(version_a), Some(version_b)) => {
version_a.cmp(version_b).reverse().then(a.path.cmp(&b.path))
}
// Sort the entries without a version arbitrarily, but stable (by path).
(None, None) => a.path.cmp(&b.path),
}
});

Expand Down
Loading