clippy improvements

DataDog · Nov 5, 2024 · ffce2c9 · ffce2c9
1 parent 1f53c87
commit ffce2c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/crates/bins/src/bin/datadog_static_analyzer_server/cli.rs b/crates/bins/src/bin/datadog_static_analyzer_server/cli.rs
@@ -148,7 +148,7 @@ pub fn prepare_rocket(tx_keep_alive_error: Sender<i32>) -> Result<RocketPreparat
         // tracing with logs
         let log_dir = matches
             .opt_str("d")
-            .map_or_else(get_default_log_dir, |d| d.into());
+            .map_or_else(get_default_log_dir, std::convert::Into::into);
         let file_appender = try_to_file_appender(
             log_rolling,
             log_dir,

diff --git a/crates/bins/src/bin/datadog_static_analyzer_server/mod.rs b/crates/bins/src/bin/datadog_static_analyzer_server/mod.rs
@@ -60,10 +60,7 @@ pub async fn start() {
             // launch the rocket and check if we receive a keep-alive error
             let result = rocket::tokio::select! {
                 a = endpoints::launch_rocket_with_endpoints(*rocket, tx_rocket_shutdown) => a,
-                b = rx_keep_alive_error.recv() => match b {
-                    Some(c) => Err(c.into()),
-                    _ => Err(EndpointError::ExitCode(ERROR_CHANNEL_SENDER_DROPPED))
-                },
+                b = rx_keep_alive_error.recv() => b.map_or_else(|| Err(EndpointError::ExitCode(ERROR_CHANNEL_SENDER_DROPPED)), |c| Err(c.into())),
             };
 
             if let Err(e) = result {