add support for conflicting groups

Cargo.toml

@@ -104,6 +104,7 @@ glob = { version = "0.3.1" }
 globset = { version = "0.4.15" }
 globwalk = { version = "0.9.1" }
 goblin = { version = "0.9.0", default-features = false, features = ["std", "elf32", "elf64", "endian_fd"] }
+hashbrown = { version = "0.15.1" }
 hex = { version = "0.4.3" }
 home = { version = "0.5.9" }
 html-escape = { version = "0.2.13" }

crates/uv-bench/benches/uv.rs

@@ -97,7 +97,7 @@ mod resolver {
     use uv_pep440::Version;
     use uv_pep508::{MarkerEnvironment, MarkerEnvironmentBuilder};
     use uv_platform_tags::{Arch, Os, Platform, Tags};
-    use uv_pypi_types::{ConflictingGroupList, ResolverMarkerEnvironment};
+    use uv_pypi_types::{Conflicts, ResolverMarkerEnvironment};
     use uv_python::Interpreter;
     use uv_resolver::{
         FlatIndex, InMemoryIndex, Manifest, OptionsBuilder, PythonRequirement, RequiresPython,
@@ -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 = ConflictingGroupList::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-cli/src/lib.rs

@@ -2804,13 +2804,19 @@ pub struct SyncArgs {
     ///
     /// May be provided more than once.
     ///
+    /// When multiple extras or groups are specified that appear in
+    /// `tool.uv.conflicts`, uv will report an error.
+    ///
     /// Note that all optional dependencies are always included in the resolution; this option only
     /// affects the selection of packages to install.
     #[arg(long, conflicts_with = "all_extras", value_parser = extra_name_with_clap_error)]
     pub extra: Option<Vec<ExtraName>>,
 
     /// Include all optional dependencies.
     ///
+    /// When two or more extras are declared as conflicting in
+    /// `tool.uv.conflicts`, using this flag will always result in an error.
+    ///
     /// Note that all optional dependencies are always included in the resolution; this option only
     /// affects the selection of packages to install.
     #[arg(long, conflicts_with = "extra")]
@@ -2841,6 +2847,9 @@ pub struct SyncArgs {
 
     /// Include dependencies from the specified dependency group.
     ///
+    /// When multiple extras or groups are specified that appear in
+    /// `tool.uv.conflicts`, uv will report an error.
+    ///
     /// May be provided multiple times.
     #[arg(long, conflicts_with("only_group"))]
     pub group: Vec<GroupName>,

crates/uv-dispatch/src/lib.rs

@@ -26,7 +26,7 @@ use uv_distribution_types::{
 };
 use uv_git::GitResolver;
 use uv_installer::{Installer, Plan, Planner, Preparer, SitePackages};
-use uv_pypi_types::{ConflictingGroupList, Requirement};
+use uv_pypi_types::{Conflicts, Requirement};
 use uv_python::{Interpreter, PythonEnvironment};
 use uv_resolver::{
     ExcludeNewer, FlatIndex, Flexibility, InMemoryIndex, Manifest, OptionsBuilder,
@@ -188,7 +188,7 @@ impl<'a> BuildContext for BuildDispatch<'a> {
             ResolverEnvironment::specific(marker_env),
             // Conflicting groups only make sense when doing
             // universal resolution.
-            ConflictingGroupList::empty(),
+            Conflicts::empty(),
             Some(tags),
             self.flat_index,
             self.index,

crates/uv-pypi-types/Cargo.toml

@@ -23,6 +23,7 @@ uv-normalize = { workspace = true, features = ["schemars"] }
 uv-pep440 = { workspace = true }
 uv-pep508 = { workspace = true }
 
+hashbrown = { workspace = true }
 indexmap = { workspace = true, features = ["serde"] }
 itertools = { workspace = true }
 jiff = { workspace = true, features = ["serde"] }