Reverts

crates/uv-resolver/src/candidate_selector.rs

@@ -138,24 +138,32 @@ impl CandidateSelector {
     ) -> Option<Candidate> {
         // In the branches, we "sort" the preferences by marker-matching through an iterator that
         // first has the matching half and then the mismatching half.
-        let preferences_match = preferences.get(package_name).filter(|(marker, _index, _version)| {
-            // `.unwrap_or(true)` because the universal marker is considered matching.
-            marker
-                .map(|marker| env.included_by_marker(marker))
-                .unwrap_or(true)
-        });
-        let preferences_mismatch = preferences.get(package_name).filter(|(marker,_index, _version)| {
-            marker
-                .map(|marker| !env.included_by_marker(marker))
-                .unwrap_or(false)
-        });
-        let preferences = preferences_match.chain(preferences_mismatch).filter_map(|(marker, source, version)| {
-            if source == index {
-                Some((marker, version))
-            } else {
-                None
-            }
-        });
+        let preferences_match =
+            preferences
+                .get(package_name)
+                .filter(|(marker, _index, _version)| {
+                    // `.unwrap_or(true)` because the universal marker is considered matching.
+                    marker
+                        .map(|marker| env.included_by_marker(marker))
+                        .unwrap_or(true)
+                });
+        let preferences_mismatch =
+            preferences
+                .get(package_name)
+                .filter(|(marker, _index, _version)| {
+                    marker
+                        .map(|marker| !env.included_by_marker(marker))
+                        .unwrap_or(false)
+                });
+        let preferences = preferences_match.chain(preferences_mismatch).filter_map(
+            |(marker, source, version)| {
+                if source == index {
+                    Some((marker, version))
+                } else {
+                    None
+                }
+            },
+        );
         self.get_preferred_from_iter(
             preferences,
             package_name,

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

@@ -333,14 +333,6 @@ impl ResolverEnvironment {
         }
     }
 
-    /// Returns `true` if this resolver environment has conflicts.
-    pub(crate) fn has_conflicts(&self) -> bool {
-        match self.kind {
-            Kind::Specific { .. } => false,
-            Kind::Universal { ref exclude, .. } => !exclude.is_empty(),
-        }
-    }
-
     /// Returns a requires-python version range derived from the marker
     /// expression describing this resolver environment.
     ///

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

@@ -64,10 +64,4 @@ impl<T> ForkMap<T> {
             .map(|entry| &entry.value)
             .collect()
     }
-    //
-    // /// Returns the single value associated with a package, if the value is compatible with all
-    // /// forks.
-    // pub fn entries(&self, package_name: &PackageName) -> &[Entry<T>] {
-    //     self.0.get(package_name).map(Vec::as_slice).unwrap_or_default()
-    // }
 }

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

@@ -59,22 +59,6 @@ impl Indexes {
         self.0.contains_key(name)
     }
 
-    // /// Returns the explicit index used for a package, if it's known to be used for all forks.
-    // pub(crate) fn contains_many(&self, name: &PackageName) -> bool {
-    //     match self.0.entries(name) {
-    //         [] => false,
-    //         [index] => index. index.conflict.is_none(),
-    //         _ => false,
-    //
-    //     }
-    //     let entry = self.0.get(name)?;
-    //     if entry.conflict.is_none() {
-    //         Some(&entry.index)
-    //     } else {
-    //         None
-    //     }
-    // }
-
     /// Return the explicit index used for a package in the given fork.
     pub(crate) fn get(&self, name: &PackageName, env: &ResolverEnvironment) -> Vec<&IndexUrl> {
         let entries = self.0.get(name, env);