*: update "conflicting groups" terminology everywhere else

Author: BurntSushi

crates/uv-bench/benches/uv.rs

@@ -163,7 +163,7 @@ mod resolver {
         let options = OptionsBuilder::new().exclude_newer(exclude_newer).build();
         let sources = SourceStrategy::default();
         let dependency_metadata = DependencyMetadata::default();
-        let conflicting_groups = Conflicts::empty();
+        let conflicts = Conflicts::empty();
 
         let python_requirement = if universal {
             PythonRequirement::from_requires_python(
@@ -209,7 +209,7 @@ mod resolver {
             options,
             &python_requirement,
             markers,
-            conflicting_groups,
+            conflicts,
             Some(&TAGS),
             &flat_index,
             &index,

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

@@ -1,6 +1,6 @@
 use uv_normalize::{ExtraName, PackageName};
 
-/// A list of conflicting groups pre-defined by an end user.
+/// A list of conflicting sets of extras/groups pre-defined by an end user.
 ///
 /// This is useful to force the resolver to fork according to extras that have
 /// unavoidable conflicts with each other. (The alternative is that resolution
@@ -11,7 +11,7 @@ use uv_normalize::{ExtraName, PackageName};
 pub struct Conflicts(Vec<ConflictSet>);
 
 impl Conflicts {
-    /// Returns no conflicting groups.
+    /// Returns no conflicts.
     ///
     /// This results in no effect on resolution.
     pub fn empty() -> Conflicts {
@@ -31,7 +31,7 @@ impl Conflicts {
     /// Returns true if these conflicts contain any set that contains the given
     /// package and extra name pair.
     pub fn contains(&self, package: &PackageName, extra: &ExtraName) -> bool {
-        self.iter().any(|groups| groups.contains(package, extra))
+        self.iter().any(|set| set.contains(package, extra))
     }
 
     /// Returns true if there are no conflicts.
@@ -78,7 +78,7 @@ impl ConflictSet {
     /// extra name pair.
     pub fn contains(&self, package: &PackageName, extra: &ExtraName) -> bool {
         self.iter()
-            .any(|group| group.package() == package && group.extra() == extra)
+            .any(|set| set.package() == package && set.extra() == extra)
     }
 }
 
@@ -87,8 +87,8 @@ impl<'de> serde::Deserialize<'de> for ConflictSet {
     where
         D: serde::Deserializer<'de>,
     {
-        let groups = Vec::<ConflictItem>::deserialize(deserializer)?;
-        Self::try_from(groups).map_err(serde::de::Error::custom)
+        let set = Vec::<ConflictItem>::deserialize(deserializer)?;
+        Self::try_from(set).map_err(serde::de::Error::custom)
     }
 }
 
@@ -193,10 +193,10 @@ impl<'a> From<(&'a PackageName, &'a ExtraName)> for ConflictItemRef<'a> {
 #[derive(Debug, thiserror::Error)]
 pub enum ConflictError {
     /// An error for when there are zero conflicting items.
-    #[error("Each set of conflicting groups must have at least two entries, but found none")]
+    #[error("Each set of conflicts must have at least two entries, but found none")]
     ZeroItems,
     /// An error for when there is one conflicting items.
-    #[error("Each set of conflicting groups must have at least two entries, but found only one")]
+    #[error("Each set of conflicts must have at least two entries, but found only one")]
     OneItem,
 }
 
@@ -222,7 +222,7 @@ impl SchemaConflicts {
     /// If a conflict has an explicit package name (written by the end user),
     /// then that takes precedence over the given package name, which is only
     /// used when there is no explicit package name written.
-    pub fn to_conflicting_with_package_name(&self, package: &PackageName) -> Conflicts {
+    pub fn to_conflicts_with_package_name(&self, package: &PackageName) -> Conflicts {
         let mut conflicting = Conflicts::empty();
         for tool_uv_set in &self.0 {
             let mut set = vec![];

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

@@ -82,7 +82,7 @@ pub struct Lock {
     /// forks in the lockfile so we can recreate them in subsequent resolutions.
     fork_markers: Vec<MarkerTree>,
     /// The conflicting groups/extras specified by the user.
-    conflicting_groups: Conflicts,
+    conflicts: Conflicts,
     /// The list of supported environments specified by the user.
     supported_environments: Vec<MarkerTree>,
     /// The range of supported Python versions.
@@ -315,7 +315,7 @@ impl Lock {
         requires_python: RequiresPython,
         options: ResolverOptions,
         manifest: ResolverManifest,
-        conflicting_groups: Conflicts,
+        conflicts: Conflicts,
         supported_environments: Vec<MarkerTree>,
         fork_markers: Vec<MarkerTree>,
     ) -> Result<Self, LockError> {
@@ -465,7 +465,7 @@ impl Lock {
         let lock = Self {
             version,
             fork_markers,
-            conflicting_groups,
+            conflicts,
             supported_environments,
             requires_python,
             options,
@@ -485,8 +485,8 @@ impl Lock {
 
     /// Record the conflicting groups that were used to generate this lock.
     #[must_use]
-    pub fn with_conflicting_groups(mut self, conflicting_groups: Conflicts) -> Self {
-        self.conflicting_groups = conflicting_groups;
+    pub fn with_conflicts(mut self, conflicts: Conflicts) -> Self {
+        self.conflicts = conflicts;
         self
     }
 
@@ -550,8 +550,8 @@ impl Lock {
     }
 
     /// Returns the conflicting groups that were used to generate this lock.
-    pub fn conflicting_groups(&self) -> &Conflicts {
-        &self.conflicting_groups
+    pub fn conflicts(&self) -> &Conflicts {
+        &self.conflicts
     }
 
     /// Returns the supported environments that were used to generate this lock.
@@ -632,17 +632,17 @@ impl Lock {
             doc.insert("supported-markers", value(supported_environments));
         }
 
-        if !self.conflicting_groups.is_empty() {
+        if !self.conflicts.is_empty() {
             let mut list = Array::new();
-            for groups in self.conflicting_groups.iter() {
+            for groups in self.conflicts.iter() {
                 list.push(each_element_on_its_line_array(groups.iter().map(|group| {
                     let mut table = InlineTable::new();
                     table.insert("package", Value::from(group.package().to_string()));
                     table.insert("extra", Value::from(group.extra().to_string()));
                     table
                 })));
             }
-            doc.insert("conflicting-groups", value(list));
+            doc.insert("conflicts", value(list));
         }
 
         // Write the settings that were used to generate the resolution.
@@ -1383,8 +1383,8 @@ struct LockWire {
     fork_markers: Vec<SimplifiedMarkerTree>,
     #[serde(rename = "supported-markers", default)]
     supported_environments: Vec<SimplifiedMarkerTree>,
-    #[serde(rename = "conflicting-groups", default)]
-    conflicting_groups: Option<Conflicts>,
+    #[serde(rename = "conflicts", default)]
+    conflicts: Option<Conflicts>,
     /// We discard the lockfile if these options match.
     #[serde(default)]
     options: ResolverOptions,
@@ -1436,7 +1436,7 @@ impl TryFrom<LockWire> for Lock {
             wire.requires_python,
             wire.options,
             wire.manifest,
-            wire.conflicting_groups.unwrap_or_else(Conflicts::empty),
+            wire.conflicts.unwrap_or_else(Conflicts::empty),
             supported_environments,
             fork_markers,
         )?;

crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_missing.snap

@@ -6,7 +6,7 @@ Ok(
     Lock {
         version: 1,
         fork_markers: [],
-        conflicting_groups: ConflictingGroupList(
+        conflicts: Conflicts(
             [],
         ),
         supported_environments: [],

crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_optional_present.snap

@@ -6,7 +6,7 @@ Ok(
     Lock {
         version: 1,
         fork_markers: [],
-        conflicting_groups: ConflictingGroupList(
+        conflicts: Conflicts(
             [],
         ),
         supported_environments: [],

crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__hash_required_present.snap

@@ -6,7 +6,7 @@ Ok(
     Lock {
         version: 1,
         fork_markers: [],
-        conflicting_groups: ConflictingGroupList(
+        conflicts: Conflicts(
             [],
         ),
         supported_environments: [],

crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_source_unambiguous.snap

@@ -6,7 +6,7 @@ Ok(
     Lock {
         version: 1,
         fork_markers: [],
-        conflicting_groups: ConflictingGroupList(
+        conflicts: Conflicts(
             [],
         ),
         supported_environments: [],

crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_source_version_unambiguous.snap

@@ -6,7 +6,7 @@ Ok(
     Lock {
         version: 1,
         fork_markers: [],
-        conflicting_groups: ConflictingGroupList(
+        conflicts: Conflicts(
             [],
         ),
         supported_environments: [],

crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_unambiguous.snap

@@ -6,7 +6,7 @@ Ok(
     Lock {
         version: 1,
         fork_markers: [],
-        conflicting_groups: ConflictingGroupList(
+        conflicts: Conflicts(
             [],
         ),
         supported_environments: [],

crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__source_direct_has_subdir.snap

@@ -6,7 +6,7 @@ Ok(
     Lock {
         version: 1,
         fork_markers: [],
-        conflicting_groups: ConflictingGroupList(
+        conflicts: Conflicts(
             [],
         ),
         supported_environments: [],