Prefer anyhow!(err) over err.into()

oxidecomputer · Nov 6, 2023 · ad8e5d6 · ad8e5d6
1 parent f2a4fe5
commit ad8e5d6
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/gateway/src/bin/mgs.rs b/gateway/src/bin/mgs.rs
@@ -136,7 +136,7 @@ async fn do_run() -> Result<(), CmdError> {
 #[cfg(target_os = "illumos")]
 fn read_smf_config() -> Result<ConfigProperties, CmdError> {
     fn scf_to_cmd_err(err: illumos_utils::scf::ScfError) -> CmdError {
-        CmdError::Failure(err.into())
+        CmdError::Failure(anyhow!(err))
     }
 
     use illumos_utils::scf::ScfHandle;

diff --git a/nexus/src/bin/nexus.rs b/nexus/src/bin/nexus.rs
@@ -54,7 +54,7 @@ async fn do_run() -> Result<(), CmdError> {
     let args = Args::parse();
 
     let config = Config::from_file(args.config_file_path)
-        .map_err(|e| CmdError::Failure(e.into()))?;
+        .map_err(|e| CmdError::Failure(anyhow!(e)))?;
 
     if args.openapi {
         run_openapi_external().map_err(|err| CmdError::Failure(anyhow!(err)))

diff --git a/sled-agent/src/bin/sled-agent-sim.rs b/sled-agent/src/bin/sled-agent-sim.rs
@@ -6,7 +6,7 @@
 
 // TODO see the TODO for nexus.
 
-use anyhow::Context;
+use anyhow::{anyhow, Context};
 use camino::Utf8PathBuf;
 use clap::Parser;
 use dropshot::ConfigDropshot;
@@ -95,8 +95,8 @@ async fn main() {
 async fn do_run() -> Result<(), CmdError> {
     let args = Args::parse();
 
-    let tmp =
-        camino_tempfile::tempdir().map_err(|e| CmdError::Failure(e.into()))?;
+    let tmp = camino_tempfile::tempdir()
+        .map_err(|e| CmdError::Failure(anyhow!(e)))?;
     let config = Config {
         id: args.uuid,
         sim_mode: args.sim_mode,
@@ -125,10 +125,10 @@ async fn do_run() -> Result<(), CmdError> {
         (Some(cert_path), Some(key_path)) => {
             let cert_bytes = std::fs::read_to_string(&cert_path)
                 .with_context(|| format!("read {:?}", &cert_path))
-                .map_err(|e| CmdError::Failure(e.into()))?;
+                .map_err(|e| CmdError::Failure(anyhow!(e)))?;
             let key_bytes = std::fs::read_to_string(&key_path)
                 .with_context(|| format!("read {:?}", &key_path))
-                .map_err(|e| CmdError::Failure(e.into()))?;
+                .map_err(|e| CmdError::Failure(anyhow!(e)))?;
             Some(NexusTypes::Certificate { cert: cert_bytes, key: key_bytes })
         }
         _ => {
@@ -147,5 +147,5 @@ async fn do_run() -> Result<(), CmdError> {
 
     run_standalone_server(&config, &rss_args)
         .await
-        .map_err(|e| CmdError::Failure(e.into()))
+        .map_err(|e| CmdError::Failure(anyhow!(e)))
 }
diff --git a/sled-agent/src/bin/sled-agent.rs b/sled-agent/src/bin/sled-agent.rs
@@ -59,7 +59,7 @@ async fn do_run() -> Result<(), CmdError> {
         },
         Args::Run { config_path } => {
             let config = SledConfig::from_file(&config_path)
-                .map_err(|e| CmdError::Failure(e.into()))?;
+                .map_err(|e| CmdError::Failure(anyhow!(e)))?;
 
             // - Sled agent starts with the normal config file - typically
             // called "config.toml".
@@ -82,15 +82,15 @@ async fn do_run() -> Result<(), CmdError> {
             let rss_config = if rss_config_path.exists() {
                 Some(
                     RssConfig::from_file(rss_config_path)
-                        .map_err(|e| CmdError::Failure(e.into()))?,
+                        .map_err(|e| CmdError::Failure(anyhow!(e)))?,
                 )
             } else {
                 None
             };
 
             let server = bootstrap_server::Server::start(config)
                 .await
-                .map_err(|err| CmdError::Failure(err.into()))?;
+                .map_err(|err| CmdError::Failure(anyhow!(err)))?;
 
             // If requested, automatically supply the RSS configuration.
             //
@@ -102,7 +102,7 @@ async fn do_run() -> Result<(), CmdError> {
                     // abandon the server.
                     Ok(_) | Err(RssAccessError::AlreadyInitialized) => {}
                     Err(e) => {
-                        return Err(CmdError::Failure(e.into()));
+                        return Err(CmdError::Failure(anyhow!(e)));
                     }
                 }
             }

diff --git a/sp-sim/src/bin/sp-sim.rs b/sp-sim/src/bin/sp-sim.rs
@@ -2,7 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::Parser;
 use omicron_common::cmd::{fatal, CmdError};
 use sp_sim::config::Config;
@@ -27,14 +27,14 @@ async fn main() {
 async fn do_run() -> Result<(), CmdError> {
     let args = Args::parse();
     let config = Config::from_file(args.config_file_path)
-        .map_err(|e| CmdError::Failure(e.into()))?;
+        .map_err(|e| CmdError::Failure(anyhow!(e)))?;
 
     let log =
-        sp_sim::logger(&config).map_err(|e| CmdError::Failure(e.into()))?;
+        sp_sim::logger(&config).map_err(|e| CmdError::Failure(anyhow!(e)))?;
 
     let _rack = SimRack::start(&config, &log)
         .await
-        .map_err(|e| CmdError::Failure(e.into()))?;
+        .map_err(|e| CmdError::Failure(anyhow!(e)))?;
 
     // for now, do nothing except let the spawned tasks run. in the future
     // (or when used as a library), the expectation is that a caller can

diff --git a/wicketd/src/bin/wicketd.rs b/wicketd/src/bin/wicketd.rs
@@ -85,10 +85,10 @@ async fn do_run() -> Result<(), CmdError> {
         } => {
             let baseboard = if let Some(baseboard_file) = baseboard_file {
                 let baseboard_file = std::fs::read_to_string(baseboard_file)
-                    .map_err(|e| CmdError::Failure(e.into()))?;
+                    .map_err(|e| CmdError::Failure(anyhow!(e)))?;
                 let baseboard: Baseboard =
                     serde_json::from_str(&baseboard_file)
-                        .map_err(|e| CmdError::Failure(e.into()))?;
+                        .map_err(|e| CmdError::Failure(anyhow!(e)))?;
 
                 // TODO-correctness `Baseboard::unknown()` is slated for removal
                 // after some refactoring in sled-agent, at which point we'll
@@ -113,7 +113,7 @@ async fn do_run() -> Result<(), CmdError> {
                 Some(addr) => Some(Ipv6Subnet::new(addr)),
                 None if read_smf_config => {
                     let smf_values = SmfConfigValues::read_current()
-                        .map_err(|e| CmdError::Failure(e.into()))?;
+                        .map_err(|e| CmdError::Failure(anyhow!(e)))?;
                     smf_values.rack_subnet
                 }
                 None => None,