Apply jgallagher suggestions from code review

Co-authored-by: John Gallagher <[email protected]>
oxidecomputer · Nov 6, 2023 · f2a4fe5 · f2a4fe5
1 parent 32082dd
commit f2a4fe5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/gateway/src/bin/mgs.rs b/gateway/src/bin/mgs.rs
@@ -72,7 +72,7 @@ async fn do_run() -> Result<(), CmdError> {
 
     match args {
         Args::Openapi => {
-            run_openapi().map_err(|e| CmdError::Failure(anyhow!("{e}")))
+            run_openapi().map_err(|e| CmdError::Failure(anyhow!(e)))
         }
         Args::Run {
             config_file_path,
@@ -125,7 +125,7 @@ async fn do_run() -> Result<(), CmdError> {
                         _ => unreachable!("invalid signal: {signal:?}"),
                     },
                     result = server.wait_for_finish() => {
-                        return result.map_err(|err| CmdError::Failure(anyhow!("{err}")))
+                        return result.map_err(|err| CmdError::Failure(anyhow!(err)))
                     }
                 }
             }

diff --git a/oximeter/collector/src/bin/oximeter.rs b/oximeter/collector/src/bin/oximeter.rs
@@ -134,7 +134,7 @@ async fn do_run() -> Result<(), CmdError> {
     let args = Args::parse();
     match args {
         Args::Openapi => {
-            run_openapi().map_err(|err| CmdError::Failure(anyhow!("{err}")))
+            run_openapi().map_err(|err| CmdError::Failure(anyhow!(err)))
         }
         Args::Run { config_file, id, address } => {
             let config = Config::from_file(config_file).unwrap();

diff --git a/sled-agent/src/bin/sled-agent.rs b/sled-agent/src/bin/sled-agent.rs
@@ -53,9 +53,9 @@ async fn do_run() -> Result<(), CmdError> {
     match args {
         Args::Openapi(flavor) => match flavor {
             OpenapiFlavor::Sled => sled_server::run_openapi()
-                .map_err(|err| CmdError::Failure(anyhow!("{err}"))),
+                .map_err(|err| CmdError::Failure(anyhow!(err))),
             OpenapiFlavor::Bootstrap => bootstrap_server::run_openapi()
-                .map_err(|err| CmdError::Failure(anyhow!("{err}"))),
+                .map_err(|err| CmdError::Failure(anyhow!(err))),
         },
         Args::Run { config_path } => {
             let config = SledConfig::from_file(&config_path)
@@ -110,7 +110,7 @@ async fn do_run() -> Result<(), CmdError> {
             server
                 .wait_for_finish()
                 .await
-                .map_err(|err| CmdError::Failure(anyhow!("{err}")))?;
+                .map_err(|err| CmdError::Failure(anyhow!(err)))?;
 
             Ok(())
         }

diff --git a/wicketd/src/bin/wicketd.rs b/wicketd/src/bin/wicketd.rs
@@ -71,7 +71,7 @@ async fn do_run() -> Result<(), CmdError> {
 
     match args {
         Args::Openapi => {
-            run_openapi().map_err(|err| CmdError::Failure(anyhow!("{err}")))
+            run_openapi().map_err(|err| CmdError::Failure(anyhow!(err)))
         }
         Args::Run {
             config_file_path,
@@ -134,11 +134,11 @@ async fn do_run() -> Result<(), CmdError> {
                 .map_err(CmdError::Failure)?;
             let server = Server::start(log, args)
                 .await
-                .map_err(|err| CmdError::Failure(anyhow!("{err}")))?;
+                .map_err(|err| CmdError::Failure(anyhow!(err)))?;
             server
                 .wait_for_finish()
                 .await
-                .map_err(|err| CmdError::Failure(anyhow!("{err}")))
+                .map_err(|err| CmdError::Failure(anyhow!(err)))
         }
     }
 }