Push priorities to pubgrub and solve virtual package with the strongest constraints first

Cargo.toml

@@ -132,7 +132,7 @@ petgraph = { version = "0.7.1" }
 platform-info = { version = "2.0.3" }
 proc-macro2 = { version = "1.0.86" }
 procfs = { version = "0.17.0", default-features = false, features = ["flate2"] }
-pubgrub = { git = "https://github.com/astral-sh/pubgrub", rev = "648aa343486e5529953153781fc86025c73c4a61" }
+pubgrub = { git = "https://github.com/astral-sh/pubgrub", branch = "konsti/simplify-prioritization" }
 quote = { version = "1.0.37" }
 rayon = { version = "1.10.0" }
 reflink-copy = { version = "0.1.19" }
@@ -177,7 +177,7 @@ unicode-width = { version = "0.1.13" }
 unscanny = { version = "0.1.0" }
 url = { version = "2.5.2", features = ["serde"] }
 urlencoding = { version = "2.1.3" }
-version-ranges = { git = "https://github.com/astral-sh/pubgrub", rev = "648aa343486e5529953153781fc86025c73c4a61" }
+version-ranges = { git = "https://github.com/astral-sh/pubgrub", branch = "konsti/simplify-prioritization" }
 walkdir = { version = "2.5.0" }
 which = { version = "7.0.0", features = ["regex"] }
 windows-registry = { version = "0.4.0" }

crates/uv-resolver/src/dependency_provider.rs

@@ -4,7 +4,7 @@ use pubgrub::{Dependencies, DependencyProvider, PackageResolutionStatistics, Ran
 
 use uv_pep440::Version;
 
-use crate::pubgrub::{PubGrubPackage, PubGrubPriority, PubGrubTiebreaker};
+use crate::pubgrub::{PubGrubPackage, PubGrubPriority};
 use crate::resolver::UnavailableReason;
 
 /// We don't use a dependency provider, we interact with state directly, but we still need this one
@@ -17,8 +17,9 @@ impl DependencyProvider for UvDependencyProvider {
     type V = Version;
     type VS = Range<Version>;
     type M = UnavailableReason;
-    /// Main priority and tiebreak for virtual packages.
-    type Priority = (PubGrubPriority, PubGrubTiebreaker);
+    /// Main priority and the priority for only virtual packages, to use the strongest constraints
+    /// per package name first.
+    type Priority = (PubGrubPriority, PubGrubPriority);
     type Err = Infallible;
 
     fn prioritize(
@@ -55,7 +56,7 @@ mod tests {
     fn priority_size() {
         assert_eq!(
             size_of::<<UvDependencyProvider as DependencyProvider>::Priority>(),
-            24
+            32
         );
     }
 }

crates/uv-resolver/src/pubgrub/mod.rs

@@ -1,7 +1,7 @@
 pub(crate) use crate::pubgrub::dependencies::PubGrubDependency;
 pub(crate) use crate::pubgrub::distribution::PubGrubDistribution;
 pub(crate) use crate::pubgrub::package::{PubGrubPackage, PubGrubPackageInner, PubGrubPython};
-pub(crate) use crate::pubgrub::priority::{PubGrubPriorities, PubGrubPriority, PubGrubTiebreaker};
+pub(crate) use crate::pubgrub::priority::{PubGrubPriorities, PubGrubPriority};
 pub(crate) use crate::pubgrub::report::PubGrubReportFormatter;
 
 mod dependencies;