diff --git a/crates/uv/src/commands/pip/install.rs b/crates/uv/src/commands/pip/install.rs index cb245ca6de7e..0ca873e1d416 100644 --- a/crates/uv/src/commands/pip/install.rs +++ b/crates/uv/src/commands/pip/install.rs @@ -30,10 +30,10 @@ use uv_resolver::{ }; use uv_types::{BuildIsolation, HashStrategy}; -use crate::commands::pip::loggers::{DefaultInstallLogger, DefaultResolveLogger}; +use crate::commands::pip::loggers::{DefaultInstallLogger, DefaultResolveLogger, InstallLogger}; use crate::commands::pip::operations::Modifications; use crate::commands::pip::{operations, resolution_environment}; -use crate::commands::{elapsed, ExitStatus, SharedState}; +use crate::commands::{ExitStatus, SharedState}; use crate::printer::Printer; /// Install packages into the current environment. @@ -204,18 +204,7 @@ pub(crate) async fn pip_install( debug!("Requirement satisfied: {requirement}"); } } - let num_requirements = requirements.len(); - let s = if num_requirements == 1 { "" } else { "s" }; - writeln!( - printer.stderr(), - "{}", - format!( - "Audited {} {}", - format!("{num_requirements} package{s}").bold(), - format!("in {}", elapsed(start.elapsed())).dimmed() - ) - .dimmed() - )?; + DefaultInstallLogger.on_audit(requirements.len(), start, printer)?; if dry_run { writeln!(printer.stderr(), "Would make no changes")?; } diff --git a/crates/uv/src/commands/pip/operations.rs b/crates/uv/src/commands/pip/operations.rs index bd8e638d65b6..7f236d3f1476 100644 --- a/crates/uv/src/commands/pip/operations.rs +++ b/crates/uv/src/commands/pip/operations.rs @@ -40,9 +40,9 @@ use uv_resolver::{ use uv_types::{HashStrategy, InFlight, InstalledPackagesProvider}; use uv_warnings::warn_user; -use crate::commands::pip::loggers::{InstallLogger, ResolveLogger}; +use crate::commands::pip::loggers::{DefaultInstallLogger, InstallLogger, ResolveLogger}; use crate::commands::reporters::{InstallReporter, PrepareReporter, ResolverReporter}; -use crate::commands::{compile_bytecode, elapsed, ChangeEventKind, DryRunEvent}; +use crate::commands::{compile_bytecode, ChangeEventKind, DryRunEvent}; use crate::printer::Printer; /// Consolidate the requirements for an installation. @@ -524,17 +524,7 @@ fn report_dry_run( // Nothing to do. if remote.is_empty() && cached.is_empty() && reinstalls.is_empty() && extraneous.is_empty() { - let s = if resolution.len() == 1 { "" } else { "s" }; - writeln!( - printer.stderr(), - "{}", - format!( - "Audited {} {}", - format!("{} package{}", resolution.len(), s).bold(), - format!("in {}", elapsed(start.elapsed())).dimmed() - ) - .dimmed() - )?; + DefaultInstallLogger.on_audit(resolution.len(), start, printer)?; writeln!(printer.stderr(), "Would make no changes")?; return Ok(()); }