chore(treewide): Also fix all `clippy` warnings

2 files changed, 14 insertions, 12 deletions

diff --git a/crates/turtle/src/atuin_server/metrics.rs b/crates/turtle/src/atuin_server/metrics.rs
index 556de6fb..6380bef1 100644
--- a/crates/turtle/src/atuin_server/metrics.rs
+++ b/crates/turtle/src/atuin_server/metrics.rs
@@ -28,10 +28,10 @@ pub(crate) fn setup_metrics_recorder() -> PrometheusHandle {
 pub(crate) async fn track_metrics(req: Request, next: Next) -> impl IntoResponse {
     let start = Instant::now();
 
-    let path = match req.extensions().get::<MatchedPath>() {
-        Some(matched_path) => matched_path.as_str().to_owned(),
-        _ => req.uri().path().to_owned(),
-    };
+    let path = req.extensions().get::<MatchedPath>().map_or_else(
+        || req.uri().path().to_owned(),
+        |matched_path| matched_path.as_str().to_owned(),
+    );
 
     let method = req.method().clone();
 
diff --git a/crates/turtle/src/atuin_server/settings.rs b/crates/turtle/src/atuin_server/settings.rs
index 9424715d..1aa9059d 100644
--- a/crates/turtle/src/atuin_server/settings.rs
+++ b/crates/turtle/src/atuin_server/settings.rs
@@ -43,19 +43,21 @@ pub(crate) struct Settings {
     pub(crate) fake_version: Option<String>,
 
     #[serde(flatten)]
+    #[expect(clippy::struct_field_names)]
     pub(crate) db_settings: DbSettings,
 }
 
 impl Settings {
     pub(crate) fn new() -> Result<Self> {
-        let mut config_file = if let Ok(p) = std::env::var("ATUIN_CONFIG_DIR") {
-            PathBuf::from(p)
-        } else {
-            let mut config_file = PathBuf::new();
-            let config_dir = crate::atuin_common::utils::config_dir();
-            config_file.push(config_dir);
-            config_file
-        };
+        let mut config_file = std::env::var("ATUIN_CONFIG_DIR").map_or_else(
+            |_| {
+                let mut config_file = PathBuf::new();
+                let config_dir = crate::atuin_common::utils::config_dir();
+                config_file.push(config_dir);
+                config_file
+            },
+            PathBuf::from,
+        );
 
         config_file.push("server.toml");