Skip to content

Commit c2aeec1

Browse files
committed
..
1 parent 65f059f commit c2aeec1

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,9 @@ impl Conflicts {
188188
.filter(|set| set.contains_item(&canonical_item))
189189
{
190190
for sub in &subs {
191-
let mut new_set = conflict_set.replaced_item(&canonical_item, (**sub).clone()).expect("`ConflictItem` should be in `ConflictSet`");
191+
let mut new_set = conflict_set
192+
.replaced_item(&canonical_item, (**sub).clone())
193+
.expect("`ConflictItem` should be in `ConflictSet`");
192194
if !direct_conflict_sets.contains(&new_set) {
193195
new_set.set_as_inferred_conflict();
194196
if !transitive_conflict_sets.contains(&new_set) {
@@ -258,7 +260,11 @@ impl ConflictSet {
258260

259261
// FIXME: Error if old is not present
260262
/// Replace an old [`ConflictItem`] with a new one.
261-
pub fn replaced_item(&self, old: &ConflictItem, new: ConflictItem) -> Result<Self, ConflictError> {
263+
pub fn replaced_item(
264+
&self,
265+
old: &ConflictItem,
266+
new: ConflictItem,
267+
) -> Result<Self, ConflictError> {
262268
let mut new_set = self.set.clone();
263269
if !new_set.contains(old) {
264270
return Err(ConflictError::ReplaceMissingConflictItem);
@@ -558,7 +564,7 @@ pub enum ConflictError {
558564
#[error("Cycle detected in transitive conflict inclusion")]
559565
ConflictInclusionCycle,
560566
#[error("Expected `ConflictSet` to contain `ConflictItem` to replace")]
561-
ReplaceMissingConflictItem
567+
ReplaceMissingConflictItem,
562568
}
563569

564570
/// Like [`Conflicts`], but for deserialization in `pyproject.toml`.

0 commit comments

Comments
 (0)