From 36a0ee9822d88fcc025419fa589bb384c3fb88ff Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Thu, 18 Jul 2024 10:09:29 -0400 Subject: [PATCH] Remove executable alias; import anstream (#5187) Post-push review from https://github.com/astral-sh/uv/pull/5160. --- crates/uv-cli/src/lib.rs | 2 +- crates/uv/src/commands/cache_dir.rs | 3 ++- crates/uv/src/commands/python/dir.rs | 3 ++- crates/uv/src/commands/tool/dir.rs | 5 +++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/crates/uv-cli/src/lib.rs b/crates/uv-cli/src/lib.rs index 6a3a98115..4a2b61af1 100644 --- a/crates/uv-cli/src/lib.rs +++ b/crates/uv-cli/src/lib.rs @@ -2215,7 +2215,7 @@ pub struct ToolDirArgs { /// /// By default, `uv tool dir` shows the directory into which the tool Python environments /// themselves are installed, rather than the directory containing the linked executables. - #[arg(long, alias = "executable")] + #[arg(long)] pub bin: bool, } diff --git a/crates/uv/src/commands/cache_dir.rs b/crates/uv/src/commands/cache_dir.rs index 43cdd6333..b028003e5 100644 --- a/crates/uv/src/commands/cache_dir.rs +++ b/crates/uv/src/commands/cache_dir.rs @@ -1,3 +1,4 @@ +use anstream::println; use owo_colors::OwoColorize; use uv_cache::Cache; @@ -5,5 +6,5 @@ use uv_fs::Simplified; /// Show the cache directory. pub(crate) fn cache_dir(cache: &Cache) { - anstream::println!("{}", cache.root().simplified_display().cyan()); + println!("{}", cache.root().simplified_display().cyan()); } diff --git a/crates/uv/src/commands/python/dir.rs b/crates/uv/src/commands/python/dir.rs index 73c9efa61..f5cebc460 100644 --- a/crates/uv/src/commands/python/dir.rs +++ b/crates/uv/src/commands/python/dir.rs @@ -1,3 +1,4 @@ +use anstream::println; use anyhow::Context; use owo_colors::OwoColorize; @@ -13,7 +14,7 @@ pub(crate) fn dir(preview: PreviewMode) -> anyhow::Result<()> { } let installed_toolchains = ManagedPythonInstallations::from_settings() .context("Failed to initialize toolchain settings")?; - anstream::println!( + println!( "{}", installed_toolchains.root().simplified_display().cyan() ); diff --git a/crates/uv/src/commands/tool/dir.rs b/crates/uv/src/commands/tool/dir.rs index 301bf7d52..a68cd209d 100644 --- a/crates/uv/src/commands/tool/dir.rs +++ b/crates/uv/src/commands/tool/dir.rs @@ -1,3 +1,4 @@ +use anstream::println; use anyhow::Context; use owo_colors::OwoColorize; @@ -14,11 +15,11 @@ pub(crate) fn dir(bin: bool, preview: PreviewMode) -> anyhow::Result<()> { if bin { let executable_directory = find_executable_directory()?; - anstream::println!("{}", executable_directory.simplified_display().cyan()); + println!("{}", executable_directory.simplified_display().cyan()); } else { let installed_tools = InstalledTools::from_settings().context("Failed to initialize tools settings")?; - anstream::println!("{}", installed_tools.root().simplified_display().cyan()); + println!("{}", installed_tools.root().simplified_display().cyan()); } Ok(())