mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-07 13:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use the canonical ImplementationName -> &str implementation (#14337)

Browse source 
Motivated by some code duplication highlighted in
https://github.com/astral-sh/uv/pull/14201, I noticed we weren't taking
advantage of the existing implementation for casting to a str here.
Unfortunately, we do need a special case for CPython still.
This commit is contained in:
Zanie Blue 2025-06-28 09:42:18 -05:00 • committed by GitHub
parent db14cc3005
commit 692667cbb0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/uv-python/src/implementation.rs
View file

@ -44,6 +44,13 @@ impl ImplementationName {
Self::GraalPy => "GraalPy",
}
}
pub fn executable_name(self) -> &'static str {
match self {
Self::CPython => "python",
Self::PyPy | Self::GraalPy => self.into(),
}
}
}
impl LenientImplementationName {
@ -53,6 +60,13 @@ impl LenientImplementationName {
Self::Unknown(name) => name,
}
}
pub fn executable_name(&self) -> &str {
match self {
Self::Known(implementation) => implementation.executable_name(),
Self::Unknown(name) => name,
}
}
}
impl From<&ImplementationName> for &'static str {

6
crates/uv-python/src/managed.rs
View file

@ -362,11 +362,7 @@ impl ManagedPythonInstallation {
/// If windowed is true, `pythonw.exe` is selected over `python.exe` on windows, with no changes
/// on non-windows.
pub fn executable(&self, windowed: bool) -> PathBuf {
let implementation = match self.implementation() {
ImplementationName::CPython => "python",
ImplementationName::PyPy => "pypy",
ImplementationName::GraalPy => "graalpy",
};
let implementation = self.implementation().executable_name();
let version = match self.implementation() {
ImplementationName::CPython => {