fix: clean up new rustc and clippy warnings on Rust 1.89

4 files changed, 7 insertions, 10 deletions

diff --git a/crates/atuin-client/src/database.rs b/crates/atuin-client/src/database.rs
index 952b80e5..15f4fff1 100644
--- a/crates/atuin-client/src/database.rs
+++ b/crates/atuin-client/src/database.rs
@@ -142,11 +142,10 @@ impl Sqlite {
             std::process::exit(1);
         }
 
-        if !path.exists() {
-            if let Some(dir) = path.parent() {
+        if !path.exists()
+            && let Some(dir) = path.parent() {
                 fs::create_dir_all(dir)?;
             }
-        }
 
         let opts = SqliteConnectOptions::from_str(path.as_os_str().to_str().unwrap())?
             .journal_mode(SqliteJournalMode::Wal)
diff --git a/crates/atuin-client/src/import/xonsh.rs b/crates/atuin-client/src/import/xonsh.rs
index 201cad15..a9e6449d 100644
--- a/crates/atuin-client/src/import/xonsh.rs
+++ b/crates/atuin-client/src/import/xonsh.rs
@@ -66,11 +66,10 @@ fn load_sessions(hist_dir: &Path) -> Result<Vec<HistoryData>> {
     for entry in fs::read_dir(hist_dir)? {
         let p = entry?.path();
         let ext = p.extension().and_then(|e| e.to_str());
-        if p.is_file() && ext == Some("json") {
-            if let Some(data) = load_session(&p)? {
+        if p.is_file() && ext == Some("json")
+            && let Some(data) = load_session(&p)? {
                 sessions.push(data);
             }
-        }
     }
     Ok(sessions)
 }
diff --git a/crates/atuin-client/src/import/zsh.rs b/crates/atuin-client/src/import/zsh.rs
index 694a9aa8..b65e2608 100644
--- a/crates/atuin-client/src/import/zsh.rs
+++ b/crates/atuin-client/src/import/zsh.rs
@@ -118,7 +118,7 @@ fn parse_extended(line: &str, counter: i64) -> History {
     imported.build().into()
 }
 
-fn unmetafy(line: &[u8]) -> Option<Cow<str>> {
+fn unmetafy(line: &[u8]) -> Option<Cow<'_, str>> {
     if line.contains(&0x83) {
         let mut s = Vec::with_capacity(line.len());
         let mut is_meta = false;
diff --git a/crates/atuin-client/src/record/sqlite_store.rs b/crates/atuin-client/src/record/sqlite_store.rs
index a3e7228b..03b5e448 100644
--- a/crates/atuin-client/src/record/sqlite_store.rs
+++ b/crates/atuin-client/src/record/sqlite_store.rs
@@ -41,11 +41,10 @@ impl SqliteStore {
             std::process::exit(1);
         }
 
-        if !path.exists() {
-            if let Some(dir) = path.parent() {
+        if !path.exists()
+            && let Some(dir) = path.parent() {
                 fs::create_dir_all(dir)?;
             }
-        }
 
         let opts = SqliteConnectOptions::from_str(path.as_os_str().to_str().unwrap())?
             .journal_mode(SqliteJournalMode::Wal)