Improve messages for empty solves and installs

astral-sh · Aug 24, 2024 · 0bfdac9 · 0bfdac9
1 parent 31019ff
commit 0bfdac9
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 21 deletions.
diff --git a/crates/uv/src/commands/pip/loggers.rs b/crates/uv/src/commands/pip/loggers.rs
@@ -43,17 +43,25 @@ pub(crate) struct DefaultInstallLogger;
 
 impl InstallLogger for DefaultInstallLogger {
     fn on_audit(&self, count: usize, start: std::time::Instant, printer: Printer) -> fmt::Result {
-        let s = if count == 1 { "" } else { "s" };
-        writeln!(
-            printer.stderr(),
-            "{}",
-            format!(
-                "Audited {} {}",
-                format!("{count} package{s}").bold(),
-                format!("in {}", elapsed(start.elapsed())).dimmed()
+        if count == 0 {
+            writeln!(
+                printer.stderr(),
+                "{}",
+                format!("Audited environment in {}", elapsed(start.elapsed())).dimmed()
             )
-            .dimmed()
-        )
+        } else {
+            let s = if count == 1 { "" } else { "s" };
+            writeln!(
+                printer.stderr(),
+                "{}",
+                format!(
+                    "Audited {} {}",
+                    format!("{count} package{s}").bold(),
+                    format!("in {}", elapsed(start.elapsed())).dimmed()
+                )
+                .dimmed()
+            )
+        }
     }
 
     fn on_prepare(&self, count: usize, start: std::time::Instant, printer: Printer) -> fmt::Result {
@@ -404,17 +412,25 @@ impl ResolveLogger for DefaultResolveLogger {
         start: std::time::Instant,
         printer: Printer,
     ) -> fmt::Result {
-        let s = if count == 1 { "" } else { "s" };
-        writeln!(
-            printer.stderr(),
-            "{}",
-            format!(
-                "Resolved {} {}",
-                format!("{count} package{s}").bold(),
-                format!("in {}", elapsed(start.elapsed())).dimmed()
+        if count == 0 {
+            writeln!(
+                printer.stderr(),
+                "{}",
+                format!("Resolved in {}", elapsed(start.elapsed())).dimmed()
             )
-            .dimmed()
-        )
+        } else {
+            let s = if count == 1 { "" } else { "s" };
+            writeln!(
+                printer.stderr(),
+                "{}",
+                format!(
+                    "Resolved {} {}",
+                    format!("{count} package{s}").bold(),
+                    format!("in {}", elapsed(start.elapsed())).dimmed()
+                )
+                .dimmed()
+            )
+        }
     }
 }
 

diff --git a/crates/uv/tests/pip_install.rs b/crates/uv/tests/pip_install.rs
@@ -54,7 +54,7 @@ fn empty_requirements_txt() -> Result<()> {
 
     ----- stderr -----
     warning: Requirements file requirements.txt does not contain any dependencies
-    Audited 0 packages in [TIME]
+    Audited environment in [TIME]
     "###
     );