Minor tweaks

Cargo.toml

@@ -175,7 +175,7 @@ xz2 = { version = "0.1.7" }
 zip = { version = "0.6.6", default-features = false, features = ["deflate"] }
 
 [workspace.metadata.cargo-shear]
-ignored = ["flate2", "xz2", "same-file"]
+ignored = ["flate2", "xz2"]
 
 [patch.crates-io]
 # For pyproject-toml

crates/uv-python/src/environment.rs

@@ -300,4 +300,26 @@ impl PythonEnvironment {
  pub fn into_interpreter(self) -> Interpreter {
  Arc::unwrap_or_clone(self.0).interpreter
  }
+
+ /// Returns `true` if the [`PythonEnvironment`] uses the same underlying [`Interpreter`].
+ pub fn uses(&self, interpreter: &Interpreter) -> bool {
+ // TODO(zanieb): Consider using `sysconfig.get_path("stdlib")` instead, which
+ // should be generally robust.
+ if cfg!(windows) {
+ // On Windows, we can't canonicalize an interpreter based on its executable path
+ // because the executables are separate shim files (not links). Instead, we
+ // compare the `sys.base_prefix`.
+ let old_base_prefix = self.interpreter().sys_base_prefix();
+ let selected_base_prefix = interpreter.sys_base_prefix();
+ old_base_prefix == selected_base_prefix
+ } else {
+ // On Unix, we can see if the canonicalized executable is the same file.
+ self.interpreter().sys_executable() == interpreter.sys_executable()
+ || same_file::is_same_file(
+ self.interpreter().sys_executable(),
+ interpreter.sys_executable(),
+ )
+ .unwrap_or(false)
+ }
+ }
 }

crates/uv-python/src/interpreter.rs

@@ -26,8 +26,7 @@ use crate::implementation::LenientImplementationName;
 use crate::platform::{Arch, Libc, Os};
 use crate::pointer_size::PointerSize;
 use crate::{
- Prefix, PythonEnvironment, PythonInstallationKey, PythonVersion, Target, VersionRequest,
- VirtualEnvironment,
+ Prefix, PythonInstallationKey, PythonVersion, Target, VersionRequest, VirtualEnvironment,
 };
 
 /// A Python executable and its associated platform markers.
@@ -498,28 +497,6 @@ impl Interpreter {
  }
  }
 
- /// Whether or not this interpreter is used by the given environment
- pub fn is_interpreter_used_by(&self, environment: &PythonEnvironment) -> bool {
- // TODO(zanieb): Consider using `sysconfig.get_path("stdlib")` instead, which
- // should be generally robust.
- if cfg!(windows) {
- // On Windows, we can't canonicalize an interpreter based on its executable path
- // because the executables are separate shim files (not links). Instead, we
- // compare the `sys.base_prefix`.
- let old_base_prefix = environment.interpreter().sys_base_prefix();
- let selected_base_prefix = self.sys_base_prefix();
- old_base_prefix == selected_base_prefix
- } else {
- // On Unix, we can see if the canonicalized executable is the same file.
- environment.interpreter().sys_executable() == self.sys_executable()
- || same_file::is_same_file(
- environment.interpreter().sys_executable(),
- self.sys_executable(),
- )
- .unwrap_or(false)
- }
- }
-
  /// Whether or not this Python interpreter is from a default Python executable name, like
  /// `python`, `python3`, or `python.exe`.
  pub(crate) fn has_default_executable_name(&self) -> bool {

crates/uv/Cargo.toml

@@ -72,7 +72,6 @@ owo-colors = { workspace = true }
 rayon = { workspace = true }
 regex = { workspace = true }
 rustc-hash = { workspace = true }
-same-file = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tempfile = { workspace = true }

crates/uv/src/commands/tool/install.rs

@@ -277,7 +277,7 @@ pub(crate) async fn install(
  installed_tools
  .get_environment(&from.name, &cache)?
  .filter(|environment| {
- if interpreter.is_interpreter_used_by(environment) {
+ if environment.uses(&interpreter) {
  trace!(
  "Existing interpreter matches the requested interpreter for `{}`: {}",
  from.name,