Remove trailing newlines in error messages (astral-sh#8322)

exag · Oct 18, 2024 · 23c80c5 · 23c80c5
1 parent d296e72
commit 23c80c5
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/crates/uv-dev/src/main.rs b/crates/uv-dev/src/main.rs
@@ -129,7 +129,7 @@ async fn main() -> ExitCode {
     if let Err(err) = result {
         eprintln!("{}", "uv-dev failed".red().bold());
         for err in err.chain() {
-            eprintln!("  {}: {}", "Caused by".red().bold(), err);
+            eprintln!("  {}: {}", "Caused by".red().bold(), err.to_string().trim());
         }
         ExitCode::FAILURE
     } else {

diff --git a/crates/uv/src/commands/build_frontend.rs b/crates/uv/src/commands/build_frontend.rs
@@ -299,11 +299,20 @@ async fn build_impl(
             Err(err) => {
                 let mut causes = err.chain();
 
-                let message = format!("{}: {}", "error".red().bold(), causes.next().unwrap());
+                let message = format!(
+                    "{}: {}",
+                    "error".red().bold(),
+                    causes.next().unwrap().to_string().trim()
+                );
                 writeln!(printer.stderr(), "{}", source.annotate(&message))?;
 
                 for err in causes {
-                    writeln!(printer.stderr(), "  {}: {}", "Caused by".red().bold(), err)?;
+                    writeln!(
+                        printer.stderr(),
+                        "  {}: {}",
+                        "Caused by".red().bold(),
+                        err.to_string().trim()
+                    )?;
                 }
             }
         }

diff --git a/crates/uv/src/commands/python/install.rs b/crates/uv/src/commands/python/install.rs
@@ -235,7 +235,12 @@ pub(crate) async fn install(
                 key.green()
             )?;
             for err in anyhow::Error::new(err).chain() {
-                writeln!(printer.stderr(), "  {}: {}", "Caused by".red().bold(), err)?;
+                writeln!(
+                    printer.stderr(),
+                    "  {}: {}",
+                    "Caused by".red().bold(),
+                    err.to_string().trim()
+                )?;
             }
         }
         return Ok(ExitStatus::Failure);

diff --git a/crates/uv/src/commands/python/uninstall.rs b/crates/uv/src/commands/python/uninstall.rs
@@ -195,7 +195,7 @@ async fn do_uninstall(
                 printer.stderr(),
                 "Failed to uninstall {}: {}",
                 key.green(),
-                err
+                err.to_string().trim()
             )?;
         }
         return Ok(ExitStatus::Failure);

diff --git a/crates/uv/src/lib.rs b/crates/uv/src/lib.rs
@@ -1629,9 +1629,13 @@ where
         Ok(code) => code.into(),
         Err(err) => {
             let mut causes = err.chain();
-            eprintln!("{}: {}", "error".red().bold(), causes.next().unwrap());
+            eprintln!(
+                "{}: {}",
+                "error".red().bold(),
+                causes.next().unwrap().to_string().trim()
+            );
             for err in causes {
-                eprintln!("  {}: {}", "Caused by".red().bold(), err);
+                eprintln!("  {}: {}", "Caused by".red().bold(), err.to_string().trim());
             }
             ExitStatus::Error.into()
         }