Use errors everywhere

Author: charliermarsh

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

@@ -55,13 +55,14 @@ pub(crate) async fn upgrade(
 
     // Determine whether we applied any upgrades.
     let mut did_upgrade = false;
-    // Determine whether a tool upgrade failed
+
+    // Determine whether any tool upgrade failed.
     let mut failed_upgrade = false;
 
-    for name in names {
+    for name in &names {
         debug!("Upgrading tool: `{name}`");
         let changelog = upgrade_tool(
-            &name,
+            name,
             printer,
             &installed_tools,
             &args,
@@ -75,32 +76,32 @@ pub(crate) async fn upgrade(
 
         match changelog {
             Ok(changelog) => {
-                if let Some(changelog) = changelog {
-                    did_upgrade |= !changelog.is_empty();
-                } else {
-                    failed_upgrade = true;
-                }
+                did_upgrade |= !changelog.is_empty();
             }
-            Err(e) => {
+            Err(err) => {
+                // If we have a single tool, return the error directly.
+                if names.len() == 1 {
+                    return Err(err);
+                }
+
                 writeln!(
                     printer.stderr(),
-                    "Failed to upgrade `{}` due to `{e}`",
+                    "Failed to upgrade `{}`: {err}",
                     name.cyan(),
                 )?;
-
                 failed_upgrade = true;
             }
         }
     }
 
-    if !did_upgrade && !failed_upgrade {
-        writeln!(printer.stderr(), "Nothing to upgrade")?;
-    }
-
     if failed_upgrade {
         return Ok(ExitStatus::Failure);
     }
 
+    if !did_upgrade {
+        writeln!(printer.stderr(), "Nothing to upgrade")?;
+    }
+
     Ok(ExitStatus::Success)
 }
 
@@ -114,53 +115,45 @@ async fn upgrade_tool(
     connectivity: Connectivity,
     concurrency: Concurrency,
     native_tls: bool,
-) -> anyhow::Result<Option<Changelog>> {
+) -> Result<Changelog> {
     // Ensure the tool is installed.
     let existing_tool_receipt = match installed_tools.get_tool_receipt(name) {
         Ok(Some(receipt)) => receipt,
         Ok(None) => {
             let install_command = format!("uv tool install {name}");
-            writeln!(
-                printer.stderr(),
+            return Err(anyhow::anyhow!(
                 "`{}` is not installed; run `{}` to install",
                 name.cyan(),
                 install_command.green()
-            )?;
-            return Ok(None);
+            ));
         }
         Err(_) => {
             let install_command = format!("uv tool install --force {name}");
-            writeln!(
-                printer.stderr(),
+            return Err(anyhow::anyhow!(
                 "`{}` is missing a valid receipt; run `{}` to reinstall",
                 name.cyan(),
                 install_command.green()
-            )?;
-            return Ok(None);
+            ));
         }
     };
 
     let existing_environment = match installed_tools.get_environment(name, cache) {
         Ok(Some(environment)) => environment,
         Ok(None) => {
             let install_command = format!("uv tool install {name}");
-            writeln!(
-                printer.stderr(),
+            return Err(anyhow::anyhow!(
                 "`{}` is not installed; run `{}` to install",
                 name.cyan(),
                 install_command.green()
-            )?;
-            return Ok(None);
+            ));
         }
         Err(_) => {
             let install_command = format!("uv tool install --force {name}");
-            writeln!(
-                printer.stderr(),
+            return Err(anyhow::anyhow!(
                 "`{}` is missing a valid environment; run `{}` to reinstall",
                 name.cyan(),
                 install_command.green()
-            )?;
-            return Ok(None);
+            ));
         }
     };
 
@@ -216,5 +209,5 @@ async fn upgrade_tool(
         )?;
     }
 
-    Ok(Some(changelog))
+    Ok(changelog)
 }

crates/uv/tests/tool_upgrade.rs

@@ -220,11 +220,11 @@ fn test_tool_upgrade_non_existing_package() {
         .env("XDG_BIN_HOME", bin_dir.as_os_str())
         .env("PATH", bin_dir.as_os_str()), @r###"
     success: false
-    exit_code: 1
+    exit_code: 2
     ----- stdout -----
 
     ----- stderr -----
-    `black` is not installed; run `uv tool install black` to install
+    error: `black` is not installed; run `uv tool install black` to install
     "###);
 
     // Attempt to upgrade all.
@@ -315,7 +315,7 @@ fn test_tool_upgrade_not_stop_if_upgrade_fails() -> anyhow::Result<()> {
      + babel==2.14.0
      - pytz==2018.5
     Installed 1 executable: pybabel
-    `python-dotenv` is missing a valid receipt; run `uv tool install --force python-dotenv` to reinstall
+    Failed to upgrade `python-dotenv`: `python-dotenv` is missing a valid receipt; run `uv tool install --force python-dotenv` to reinstall
     "###);
 
     Ok(())