From c8bb7da9a21d986d1d980f32b91221f2040f9db5 Mon Sep 17 00:00:00 2001
From: Charlie Marsh <charlie.r.marsh@gmail.com>
Date: Tue, 12 May 2026 16:43:10 -0400
Subject: [PATCH] Optimize conflict registration

Register top-level wheel entries directly instead of recursively walking every installed path before discarding nested entries.

The extracted file count was only used for tracing, so drop it from the link_wheel_files API rather than preserving a recursive count that would defeat the optimization.

Co-authored-by: Codex <noreply@openai.com>
---
 crates/uv-install-wheel/src/install.rs |  6 +++---
 crates/uv-install-wheel/src/linker.rs  | 27 +++++++++-----------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/crates/uv-install-wheel/src/install.rs b/crates/uv-install-wheel/src/install.rs
index e14031afbe3da..64b20246fb568 100644
--- a/crates/uv-install-wheel/src/install.rs
+++ b/crates/uv-install-wheel/src/install.rs
@@ -69,13 +69,13 @@ pub fn install_wheel<Cache: serde::Serialize, Build: serde::Serialize>(
 
     // > 1.c If Root-Is-Purelib == ‘true’, unpack archive into purelib (site-packages).
     // > 1.d Else unpack archive into platlib (site-packages).
-    trace!(?name, "Extracting file");
+    trace!(?name, "Extracting wheel files");
     let site_packages = match lib_kind {
         LibKind::Pure => &layout.scheme.purelib,
         LibKind::Plat => &layout.scheme.platlib,
     };
-    let num_unpacked = link_wheel_files(link_mode, site_packages, &wheel, state, filename)?;
-    trace!(?name, "Extracted {num_unpacked} files");
+    link_wheel_files(link_mode, site_packages, &wheel, state, filename)?;
+    trace!(?name, "Extracted wheel files");
 
     // Read the RECORD file.
     let mut record_file = File::open(
diff --git a/crates/uv-install-wheel/src/linker.rs b/crates/uv-install-wheel/src/linker.rs
index 1590cb0829592..736e412e486e3 100644
--- a/crates/uv-install-wheel/src/linker.rs
+++ b/crates/uv-install-wheel/src/linker.rs
@@ -8,7 +8,6 @@ use fs_err as fs;
 use itertools::Itertools;
 use rustc_hash::FxHashMap;
 use tracing::{debug, instrument};
-use walkdir::WalkDir;
 
 use uv_distribution_filename::WheelFilename;
 use uv_fs::Simplified;
@@ -249,8 +248,6 @@ impl InstallState {
 }
 
 /// Extract a wheel by linking all of its files into site packages.
-///
-/// Returns the number of files extracted.
 #[instrument(skip_all)]
 pub fn link_wheel_files(
     link_mode: LinkMode,
@@ -258,10 +255,10 @@ pub fn link_wheel_files(
     wheel: impl AsRef<Path>,
     state: &InstallState,
     filename: &WheelFilename,
-) -> Result<usize, Error> {
+) -> Result<(), Error> {
     let wheel = wheel.as_ref();
     let site_packages = site_packages.as_ref();
-    let count = register_installed_paths(wheel, state, filename)?;
+    register_installed_paths(wheel, state, filename)?;
 
     // The `RECORD` file is modified during installation, so it needs a real
     // copy rather than a link back to the cache.
@@ -281,7 +278,7 @@ pub fn link_wheel_files(
         update_site_packages_mtime(site_packages);
     }
 
-    Ok(count)
+    Ok(())
 }
 
 /// Update the mtime of the site-packages directory to the current time.
@@ -303,23 +300,17 @@ fn update_site_packages_mtime(site_packages: &Path) {
     }
 }
 
-/// Walk the wheel directory and register all paths for conflict detection.
-///
-/// Returns the number of files (not directories) in the wheel.
+/// Register top-level wheel paths for conflict detection.
 fn register_installed_paths(
     wheel: &Path,
     state: &InstallState,
     filename: &WheelFilename,
-) -> Result<usize, Error> {
-    let mut count = 0;
-    for entry in WalkDir::new(wheel) {
+) -> Result<(), Error> {
+    for entry in fs::read_dir(wheel)? {
         let entry = entry?;
         let path = entry.path();
-        let relative = path.strip_prefix(wheel).expect("walkdir starts with root");
-        state.register_installed_path(relative, path, filename);
-        if entry.file_type().is_file() {
-            count += 1;
-        }
+        let relative = PathBuf::from(entry.file_name());
+        state.register_installed_path(&relative, &path, filename);
     }
-    Ok(count)
+    Ok(())
 }