Respect self-constraints on recursive extras

Author: charliermarsh

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

@@ -1609,10 +1609,30 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
                     }
                 };
                 if name == Some(&requirement.name) {
+                    let Requirement {
+                        name,
+                        extras,
+                        groups,
+                        marker,
+                        source,
+                        origin,
+                    } = requirement;
+
+                    // Add the constraints for that extra, i.e., if `project[foo]` includes `project[bar]>1.0`,
+                    // as a dependency, we need to propagate `project>1.0`, in addition to transitively
+                    // expanding `project[bar]`.
+                    requirements.push(Cow::Owned(Requirement {
+                        name,
+                        extras: vec![],
+                        groups,
+                        marker,
+                        source,
+                        origin,
+                    }));
+
                     // Add each transitively included extra.
                     queue.extend(
-                        requirement
-                            .extras
+                        extras
                             .iter()
                             .cloned()
                             .map(|extra| (extra, requirement.marker)),
@@ -1625,7 +1645,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
         }
 
         // Drop all the self-requirements now that we flattened them out.
-        requirements.retain(|req| name != Some(&req.name));
+        requirements.retain(|req| name != Some(&req.name) || req.extras.is_empty());
 
         requirements
     }

crates/uv/tests/it/lock.rs

@@ -19131,6 +19131,10 @@ fn lock_recursive_extra() -> Result<()> {
             lock, @r###"
         version = 1
         requires-python = ">=3.12"
+        resolution-markers = [
+            "python_full_version >= '3.13' or sys_platform != 'darwin'",
+            "python_full_version < '3.13' and sys_platform == 'darwin'",
+        ]
 
         [options]
         exclude-newer = "2024-03-25T00:00:00Z"
@@ -19585,12 +19589,15 @@ fn lock_self_extra_to_extra_incompatible() -> Result<()> {
     )?;
 
     uv_snapshot!(context.filters(), context.lock(), @r###"
-    success: true
-    exit_code: 0
+    success: false
+    exit_code: 1
     ----- stdout -----
 
     ----- stderr -----
-    Resolved 2 packages in [TIME]
+      × No solution found when resolving dependencies:
+      ╰─▶ Because project[foo] depends on your project and your project requires project[foo], we can conclude that your project's requirements are unsatisfiable.
+
+          hint: The package `project[foo]` depends on itself. This is likely a mistake. Consider removing the dependency.
     "###);
 
     let lock = context.read("uv.lock");