From 27086811f7d0e5a98da4a7d209c043c98e6aedaa Mon Sep 17 00:00:00 2001 From: Luca BRUNO Date: Fri, 27 Sep 2024 18:16:18 +0200 Subject: [PATCH] fix: use EXE_SUFFIX --- crates/uv/src/commands/tool/common.rs | 3 ++- crates/uv/src/commands/tool/uninstall.rs | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/uv/src/commands/tool/common.rs b/crates/uv/src/commands/tool/common.rs index 2a0a47e8c2e2..a20d491a90df 100644 --- a/crates/uv/src/commands/tool/common.rs +++ b/crates/uv/src/commands/tool/common.rs @@ -1,3 +1,4 @@ +use std::env::consts::EXE_SUFFIX; use std::fmt::Write; use std::path::Path; use std::{collections::BTreeSet, ffi::OsString}; @@ -166,7 +167,7 @@ pub(crate) fn install_executables( replace_symlink(source_path, target_path).context("Failed to install executable")?; #[cfg(windows)] fs_err::copy(source_path, target_path).context("Failed to install entrypoint")?; - names.insert(name.trim_end_matches(".exe")); + names.insert(name.trim_end_matches(EXE_SUFFIX)); } let s = if names.len() == 1 { "" } else { "s" }; diff --git a/crates/uv/src/commands/tool/uninstall.rs b/crates/uv/src/commands/tool/uninstall.rs index 5b3e3fd8ee76..9c7a83b5a865 100644 --- a/crates/uv/src/commands/tool/uninstall.rs +++ b/crates/uv/src/commands/tool/uninstall.rs @@ -1,3 +1,4 @@ +use std::env::consts::EXE_SUFFIX; use std::fmt::Write; use anyhow::{bail, Result}; @@ -148,8 +149,8 @@ async fn do_uninstall( entrypoints }; entrypoints.sort_unstable_by(|a, b| { - let a_trimmed = a.name.trim_end_matches(".exe"); - let b_trimmed = b.name.trim_end_matches(".exe"); + let a_trimmed = a.name.trim_end_matches(EXE_SUFFIX); + let b_trimmed = b.name.trim_end_matches(EXE_SUFFIX); a_trimmed.cmp(b_trimmed) });