mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-07 13:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make the resolver deterministic (#218)

Browse source 
At a minor performance cost...

Closes https://github.com/astral-sh/puffin/issues/204.
This commit is contained in:
Charlie Marsh 2023-10-29 11:42:25 -07:00 • committed by GitHub
parent bae3c89ab1
commit 1e4259a608
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/puffin-resolver/src/resolver.rs
View file

@ -259,8 +259,6 @@ impl<'a, Context: BuildContext + Sync> Resolver<'a, Context> {
in_flight: &mut FxHashSet<String>,
request_sink: &futures::channel::mpsc::UnboundedSender<Request>,
) -> Result<(T, Option<PubGrubVersion>), ResolveError> {
let mut selection = 0usize;
// Iterate over the potential packages, and fetch file metadata for any of them. These
// represent our current best guesses for the versions that we _might_ select.
for (index, (package, range)) in potential_packages.iter().enumerate() {
@ -302,14 +300,12 @@ impl<'a, Context: BuildContext + Sync> Resolver<'a, Context> {
}
}
}
selection = index;
}
// TODO(charlie): This is really ugly, but we need to return `T`, not `&T` (and yet
// we also need to iterate over `potential_packages` multiple times, so we can't
// use `into_iter()`.)
let (package, range) = potential_packages.swap_remove(selection);
// Always choose the first package.
// TODO(charlie): Devise a better strategy here (for example: always choose the package with
// the fewest versions).
let (package, range) = potential_packages.swap_remove(0);
return match package.borrow() {
PubGrubPackage::Root => Ok((package, Some(MIN_VERSION.clone()))),