mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-01 12:24:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

uv: use ResolverEnvironment instead of ResolverMarkers

Browse source 
This updates the surrounding code to use the new ResolverEnvironment
type. In some cases, this simplifies caller code by removing case
analysis. There *shouldn't* be any behavior changes here. Some test
snapshots were updated to account for some minor tweaks to error
messages.

I didn't split this up into separate commits because it would have been
too difficult/costly.
This commit is contained in:
Andrew Gallant 2024-10-11 15:23:38 -04:00 • committed by Andrew Gallant
parent 44c9ef6aea
commit acaed763b7
42 changed files with 416 additions and 600 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/uv-bench/benches/uv.rs
View file

@ -101,7 +101,7 @@ mod resolver {
use uv_python::Interpreter;
use uv_resolver::{
FlatIndex, InMemoryIndex, Manifest, OptionsBuilder, PythonRequirement, RequiresPython,
ResolutionGraph, Resolver, ResolverMarkers,
ResolutionGraph, Resolver, ResolverEnvironment,
};
use uv_types::{BuildIsolation, EmptyInstalledPackages, HashStrategy, InFlight};
@ -198,9 +198,9 @@ mod resolver {
);
let markers = if universal {
ResolverMarkers::universal(vec![])
ResolverEnvironment::universal(vec![])
} else {
ResolverMarkers::specific_environment(ResolverMarkerEnvironment::from(MARKERS.clone()))
ResolverEnvironment::specific(ResolverMarkerEnvironment::from(MARKERS.clone()))
};
let resolver = Resolver::new(