Only apply to locals, if a version is available

Author: charliermarsh

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

@@ -228,11 +228,6 @@ impl PubGrubPackage {
         }
     }
 
-    /// Returns `true` if this PubGrub package is the root package.
-    pub(crate) fn is_root(&self) -> bool {
-        matches!(&**self, PubGrubPackageInner::Root(_))
-    }
-
     /// Returns `true` if this PubGrub package is a proxy package.
     pub(crate) fn is_proxy(&self) -> bool {
         matches!(

crates/uv-resolver/src/resolver/availability.rs

@@ -170,6 +170,6 @@ pub(crate) enum ResolverVersion {
     Unavailable(Version, UnavailableVersion),
     /// A usable version
     Unforked(Version),
-    /// A set of forks.
-    Forked(Vec<ResolverEnvironment>),
+    /// A set of forks, optionally with resolved versions
+    Forked(Vec<(ResolverEnvironment, Option<Version>)>),
 }

crates/uv-resolver/src/resolver/environment.rs

@@ -559,7 +559,7 @@ pub(crate) fn fork_version_by_python_requirement(
 pub(crate) fn fork_version_by_marker(
     env: &ResolverEnvironment,
     marker: MarkerTree,
-) -> Vec<ResolverEnvironment> {
+) -> Option<(ResolverEnvironment, ResolverEnvironment)> {
     let Kind::Universal {
         markers: ref env_marker,
         ..
@@ -584,20 +584,18 @@ pub(crate) fn fork_version_by_marker(
     // `sys_platform == 'win32'`, return an empty list, since the following isn't satisfiable:
     //
     //   python_version >= '3.10' and sys_platform == 'linux' and sys_platform == 'win32'
-
-    let mut envs = vec![];
     if env_marker.is_disjoint(marker) {
-        return vec![];
+        return None;
     }
-    envs.push(env.narrow_environment(marker));
+    let with_marker = env.narrow_environment(marker);
 
     let complement = marker.negate();
     if env_marker.is_disjoint(complement) {
-        return vec![];
+        return None;
     }
-    envs.push(env.narrow_environment(complement));
+    let without_marker = env.narrow_environment(complement);
 
-    envs
+    Some((with_marker, without_marker))
 }
 
 #[cfg(test)]