clippy + formatting

Signed-off-by: Mikayla Thompson <[email protected]>

Author: mikaylathompson

crates/uv-client/src/error.rs

@@ -295,7 +295,7 @@ pub enum ErrorKind {
     WrappedReqwestError(DisplaySafeUrl, #[source] WrappedReqwestError),
 
     /// Download was cancelled by the pre-download hook.
-    #[error("Download cancelled: `{0}`")]
+    #[error("Download cancelled by user")]
     DownloadCancelled(DisplaySafeUrl),
 
     /// Add the number of failed retries to the error.

crates/uv-client/src/lib.rs

@@ -3,7 +3,9 @@ pub use base_client::{
     RedirectClientWithMiddleware, RequestBuilder, RetryParsingError, UvRetryableStrategy,
     is_transient_network_error,
 };
-pub use cached_client::{CacheControl, CachedClient, CachedClientError, DataWithCachePolicy, PreDownloadHook};
+pub use cached_client::{
+    CacheControl, CachedClient, CachedClientError, DataWithCachePolicy, PreDownloadHook,
+};
 pub use error::{Error, ErrorKind, WrappedReqwestError};
 pub use flat_index::{FlatIndexClient, FlatIndexEntries, FlatIndexEntry, FlatIndexError};
 pub use linehaul::LineHaul;

crates/uv-client/src/registry_client.rs

@@ -58,7 +58,6 @@ pub struct RegistryClientBuilder<'a> {
     pre_download_hook: Option<PreDownloadHook>,
 }
 
-
 impl<'a> RegistryClientBuilder<'a> {
     pub fn new(base_client_builder: BaseClientBuilder<'a>, cache: Cache) -> Self {
         Self {
@@ -75,8 +74,7 @@ impl<'a> RegistryClientBuilder<'a> {
     /// The hook receives the URL and returns `Ok(true)` to proceed with download,
     /// `Ok(false)` to cancel, or `Err` on error.
     #[must_use]
-    pub fn pre_download_hook(mut self, hook: PreDownloadHook) -> Self
-    {
+    pub fn pre_download_hook(mut self, hook: PreDownloadHook) -> Self {
         self.pre_download_hook = Some(hook);
         self
     }

crates/uv/src/commands/project/environment.rs

@@ -5,7 +5,8 @@ use tracing::debug;
 use crate::commands::pip::loggers::{InstallLogger, ResolveLogger};
 use crate::commands::pip::operations::Modifications;
 use crate::commands::project::{
-    EnvironmentSpecification, PlatformState, ProjectError, sync_environment,
+    EnvironmentSpecification, PlatformState, ProjectError, resolve_environment_with_hook,
+    sync_environment,
 };
 use crate::printer::Printer;
 use crate::settings::ResolverInstallerSettings;
@@ -167,7 +168,7 @@ impl CachedEnvironment {
 
         // Resolve the requirements with the interpreter.
         let resolution = Resolution::from(
-            crate::commands::project::resolve_environment_with_hook(
+            resolve_environment_with_hook(
                 spec,
                 &interpreter,
                 python_platform,

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

@@ -38,7 +38,9 @@ use uv_python::{
     PythonPreference, PythonRequest,
 };
 use uv_requirements::{RequirementsSource, RequirementsSpecification};
-use uv_settings::{InstallPromptHeuristic, PythonInstallMirrors, ResolverInstallerOptions, ToolOptions};
+use uv_settings::{
+    InstallPromptHeuristic, PythonInstallMirrors, ResolverInstallerOptions, ToolOptions,
+};
 use uv_shell::runnable::WindowsRunnable;
 use uv_static::EnvVars;
 use uv_tool::{InstalledTools, entrypoint_paths};
@@ -107,8 +109,11 @@ fn is_top_package(package_name: &PackageName) -> bool {
 
 /// Check heuristics and build reasoning string.
 ///
-/// Returns (should_skip_prompt, reasoning_string)
-fn check_heuristics(requirement: &Requirement, enabled_heuristics: &[InstallPromptHeuristic]) -> (bool, String) {
+/// Returns (`should_skip_prompt`, `reasoning_string`)
+fn check_heuristics(
+    requirement: &Requirement,
+    enabled_heuristics: &[InstallPromptHeuristic],
+) -> (bool, String) {
     let mut reasoning_parts = Vec::new();
     let mut should_skip_prompt = false;
 
@@ -143,7 +148,7 @@ fn check_heuristics(requirement: &Requirement, enabled_heuristics: &[InstallProm
 
 /// Check if we need to prompt for tool installation and prompt if necessary.
 ///
-/// Returns Ok(ExitStatus::Success) if we should proceed, Ok(ExitStatus::Failure) if cancelled, Err on error.
+/// Returns `Ok(ExitStatus::Success)` if we should proceed, `Ok(ExitStatus::Failure)` if cancelled, Err on error.
 fn check_and_prompt_for_tool_install(
     requirement: &Requirement,
     preview: Preview,
@@ -199,10 +204,9 @@ fn check_and_prompt_for_tool_install(
     if !term.is_term() {
         debug!("Not a TTY interface, skipping prompt but printing message");
         let message = format!(
-            "{}\nNon-interactive mode: installation will proceed automatically.",
-            prompt_message
+            "{prompt_message}\nNon-interactive mode: installation will proceed automatically."
         );
-        writeln!(printer.stderr(), "{}", message)?;
+        writeln!(printer.stderr(), "{message}")?;
         return Ok(ExitStatus::Success);
     }
 
@@ -212,8 +216,8 @@ fn check_and_prompt_for_tool_install(
         requirement.name.as_str()
     );
 
-    write!(printer.stderr(), "{}\n", prompt_message)?;
-    match uv_console::confirm("Would you like to proceed?", &term, true) {
+    writeln!(printer.stderr(), "{prompt_message}")?;
+    match uv_console::confirm("Would you like to proceed?\n", &term, true) {
         Ok(true) => {
             debug!(
                 "User confirmed installation of {}",
@@ -1047,7 +1051,6 @@ async fn get_or_create_environment(
     )
     .await?;
 
-
     // Set up a pre-download hook that prompts before downloading new files.
     // The hook is called before any download happens, allowing us to prompt only when needed.
     // Clone approve_all_heuristics to Vec to own it for the 'static closure
@@ -1065,30 +1068,30 @@ async fn get_or_create_environment(
                 let approve_all_heuristics = approve_all_heuristics_arc.clone();
                 let url = url.clone();
 
-                    // Check if we've already prompted and got approval
-                    if let Some(result) = *prompt_approved.lock().unwrap() {
-                        return Ok(result);
-                    }
-                    debug!("Pre-download hook triggered for: {}", url);
-
-                    // Prompt the user
-                    let approved = matches!(
-                        check_and_prompt_for_tool_install(
-                            &*requirement,
-                            preview,
-                            approve_all_tool_installs,
-                            &*approve_all_heuristics,
-                            printer,
-                        )
-                        .map_err(|_| { Error::from(ErrorKind::DownloadCancelled(url)) })?,
-                        ExitStatus::Success
-                    );
+                // Check if we've already prompted and got approval
+                if let Some(result) = *prompt_approved.lock().unwrap() {
+                    return Ok(result);
+                }
+                debug!("Pre-download hook triggered for: {}", url);
 
-                    // Cache the result
-                    *prompt_approved.lock().unwrap() = Some(approved);
+                // Prompt the user
+                let approved = matches!(
+                    check_and_prompt_for_tool_install(
+                        &requirement,
+                        preview,
+                        approve_all_tool_installs,
+                        &approve_all_heuristics,
+                        printer,
+                    )
+                    .map_err(|_| { Error::from(ErrorKind::DownloadCancelled(url)) })?,
+                    ExitStatus::Success
+                );
 
-                    Ok(approved)
-                }))
+                // Cache the result
+                *prompt_approved.lock().unwrap() = Some(approved);
+
+                Ok(approved)
+            }))
         } else {
             None
         };
@@ -1313,35 +1316,35 @@ async fn get_or_create_environment(
         Ok(environment) => environment,
         Err(err) => match err {
             ProjectError::Operation(err) => {
-            // If the resolution failed due to the discovered interpreter not satisfying the
-            // `requires-python` constraint, we can try to refine the interpreter.
-            //
-            // For example, if we discovered a Python 3.8 interpreter on the user's machine,
-            // but the tool requires Python 3.10 or later, we can try to download a
-            // Python 3.10 interpreter and re-resolve.
-            let Some(interpreter) = refine_interpreter(
-                &interpreter,
-                python_request.as_ref(),
-                &err,
-                client_builder,
-                &reporter,
-                &install_mirrors,
-                python_preference,
-                python_downloads,
-                cache,
-                preview,
-            )
-            .await
-            .ok()
-            .flatten() else {
-                return Err(err.into());
-            };
+                // If the resolution failed due to the discovered interpreter not satisfying the
+                // `requires-python` constraint, we can try to refine the interpreter.
+                //
+                // For example, if we discovered a Python 3.8 interpreter on the user's machine,
+                // but the tool requires Python 3.10 or later, we can try to download a
+                // Python 3.10 interpreter and re-resolve.
+                let Some(interpreter) = refine_interpreter(
+                    &interpreter,
+                    python_request.as_ref(),
+                    &err,
+                    client_builder,
+                    &reporter,
+                    &install_mirrors,
+                    python_preference,
+                    python_downloads,
+                    cache,
+                    preview,
+                )
+                .await
+                .ok()
+                .flatten() else {
+                    return Err(err.into());
+                };
 
-            debug!(
-                "Re-resolving with Python {} (`{}`)",
-                interpreter.python_version(),
-                interpreter.sys_executable().display()
-            );
+                debug!(
+                    "Re-resolving with Python {} (`{}`)",
+                    interpreter.python_version(),
+                    interpreter.sys_executable().display()
+                );
 
                 CachedEnvironment::from_spec(
                     spec,

crates/uv/tests/it/tool_run.rs

@@ -3176,9 +3176,9 @@ fn tool_run_install_confirmation() -> anyhow::Result<()> {
 
     // Create uv.toml with empty heuristics to disable top-packages check
     let config = context.temp_dir.child("uv.toml");
-    config.write_str(indoc::indoc! {r#"
+    config.write_str(indoc::indoc! {r"
         approve-all-heuristics = []
-    "#})?;
+    "})?;
 
     // Run with preview flag enabled and tool-install-confirmation feature
     // Use a package not in top-packages list to trigger prompt
@@ -3226,7 +3226,7 @@ fn tool_run_install_confirmation() -> anyhow::Result<()> {
 
 /// Test that tool install confirmation prompt is NOT shown when preview flag is disabled.
 #[test]
-fn tool_run_install_confirmation_preview_disabled() -> anyhow::Result<()> {
+fn tool_run_install_confirmation_preview_disabled() {
     let context = TestContext::new("3.12");
     let tool_dir = context.temp_dir.child("tools");
     let bin_dir = context.temp_dir.child("bin");
@@ -3254,8 +3254,6 @@ fn tool_run_install_confirmation_preview_disabled() -> anyhow::Result<()> {
      + pathspec==0.12.1
      + platformdirs==4.2.0
     "###);
-
-    Ok(())
 }
 
 /// Test that tool install confirmation is skipped when --approve-all-tool-installs is set.
@@ -3267,9 +3265,9 @@ fn tool_run_install_confirmation_approve_all_flag() -> anyhow::Result<()> {
 
     // Create uv.toml with empty heuristics list
     let config = context.temp_dir.child("uv.toml");
-    config.write_str(indoc::indoc! {r#"
+    config.write_str(indoc::indoc! {r"
         approve-all-heuristics = []
-    "#})?;
+    "})?;
 
     // Run with --approve-all-tool-installs flag and preview enabled - should not prompt
     uv_snapshot!(context.filters(), context.tool_run()
@@ -3304,10 +3302,10 @@ fn tool_run_install_confirmation_approve_all_config() -> anyhow::Result<()> {
 
     // Create uv.toml with approve-all-tool-installs = true and empty heuristics list
     let config = context.temp_dir.child("uv.toml");
-    config.write_str(indoc::indoc! {r#"
+    config.write_str(indoc::indoc! {r"
         approve-all-tool-installs = true
         approve-all-heuristics = []
-    "#})?;
+    "})?;
 
     // Run with preview enabled - should not prompt due to config
     uv_snapshot!(context.filters(), context.tool_run()
@@ -3335,7 +3333,7 @@ fn tool_run_install_confirmation_approve_all_config() -> anyhow::Result<()> {
 
 /// Test that tool install confirmation is skipped when package is in top-packages (default heuristic).
 #[test]
-fn tool_run_install_confirmation_top_packages_heuristic() -> anyhow::Result<()> {
+fn tool_run_install_confirmation_top_packages_heuristic() {
     let context = TestContext::new("3.12");
     let tool_dir = context.temp_dir.child("tools");
     let bin_dir = context.temp_dir.child("bin");
@@ -3359,8 +3357,6 @@ fn tool_run_install_confirmation_top_packages_heuristic() -> anyhow::Result<()>
     Installed 1 package in [TIME]
      + ruff==0.3.4
     "###);
-
-    Ok(())
 }
 
 /// Test that tool install confirmation shows reasoning when package is not in top-packages.
@@ -3410,7 +3406,7 @@ fn tool_run_install_confirmation_reasoning_top_packages() -> anyhow::Result<()>
 
 /// Test that tool install confirmation is skipped when package is already cached.
 #[test]
-fn tool_run_install_confirmation_cached_package() -> anyhow::Result<()> {
+fn tool_run_install_confirmation_cached_package() {
     let context = TestContext::new("3.12");
     let tool_dir = context.temp_dir.child("tools");
     let bin_dir = context.temp_dir.child("bin");
@@ -3441,13 +3437,11 @@ fn tool_run_install_confirmation_cached_package() -> anyhow::Result<()> {
     ----- stderr -----
     Resolved 1 package in [TIME]
     "###);
-
-    Ok(())
 }
 
 /// Test that tool install confirmation shows message in non-TTY mode with reasoning.
 #[test]
-fn tool_run_install_confirmation_non_tty() -> anyhow::Result<()> {
+fn tool_run_install_confirmation_non_tty() {
     let context = TestContext::new("3.12");
     let tool_dir = context.temp_dir.child("tools");
     let bin_dir = context.temp_dir.child("bin");
@@ -3475,8 +3469,6 @@ fn tool_run_install_confirmation_non_tty() -> anyhow::Result<()> {
       × No solution found when resolving tool dependencies:
       ╰─▶ Because a-very-unpopular-python-package was not found in the package registry and you require a-very-unpopular-python-package, we can conclude that your requirements are unsatisfiable.
     "###);
-
-    Ok(())
 }
 
 /// Test that tool install confirmation can be cancelled.
@@ -3525,7 +3517,7 @@ fn tool_run_install_confirmation_cancelled() -> anyhow::Result<()> {
 }
 
 #[test]
-fn tool_run_install_confirmation_tool_from_package() -> anyhow::Result<()> {
+fn tool_run_install_confirmation_tool_from_package() {
     let context = TestContext::new("3.12");
     let tool_dir = context.temp_dir.child("tools");
     let bin_dir = context.temp_dir.child("bin");
@@ -3553,6 +3545,4 @@ fn tool_run_install_confirmation_tool_from_package() -> anyhow::Result<()> {
       × No solution found when resolving tool dependencies:
       ╰─▶ Because a-very-unpopular-python-package was not found in the package registry and you require a-very-unpopular-python-package, we can conclude that your requirements are unsatisfiable.
     "###);
-
-    Ok(())
 }