..

Author: jtfmumm

crates/uv-pypi-types/src/conflicts.rs

@@ -188,7 +188,7 @@ impl Conflicts {
                 .filter(|set| set.contains_item(&canonical_item))
             {
                 for sub in &subs {
-                    let mut new_set = conflict_set.replaced_item(&canonical_item, (**sub).clone());
+                    let mut new_set = conflict_set.replaced_item(&canonical_item, (**sub).clone()).expect("`ConflictItem` should be in `ConflictSet`");
                     if !direct_conflict_sets.contains(&new_set) {
                         new_set.set_as_inferred_conflict();
                         if !transitive_conflict_sets.contains(&new_set) {
@@ -259,14 +259,17 @@ impl ConflictSet {
     // FIXME: Error if old is not present
     /// Replace an old [`ConflictItem`] with a new one.
     #[must_use]
-    pub fn replaced_item(&self, old: &ConflictItem, new: ConflictItem) -> Self {
+    pub fn replaced_item(&self, old: &ConflictItem, new: ConflictItem) -> Result<Self, ConflictError> {
         let mut new_set = self.set.clone();
+        if !new_set.contains(old) {
+            return Err(ConflictError::ReplaceMissingConflictItem);
+        }
         new_set.remove(old);
         new_set.insert(new);
-        Self {
+        Ok(Self {
             set: new_set,
             is_inferred_conflict: false,
-        }
+        })
     }
 
     /// Mark this [`ConflictSet`] as being inferred from directly
@@ -555,6 +558,8 @@ pub enum ConflictError {
     FoundExtraAndGroup,
     #[error("Cycle detected in transitive conflict inclusion")]
     ConflictInclusionCycle,
+    #[error("Expected `ConflictSet` to contain `ConflictItem` to replace")]
+    ReplaceMissingConflictItem
 }
 
 /// Like [`Conflicts`], but for deserialization in `pyproject.toml`.