From 8f91b1410c2bc67e6b3da8a1927da31a9dfb09ab Mon Sep 17 00:00:00 2001
From: Conrad Ludgate <conradludgate@gmail.com>
Date: Sat, 13 Nov 2021 22:40:24 +0000
Subject: chore: some new linting (#201)

* chore: some new linting

* chore: some more linting

* chore: rustfmt
---
 atuin-client/src/encryption.rs  | 7 ++-----
 atuin-client/src/import/resh.rs | 2 --
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'atuin-client/src')

diff --git a/atuin-client/src/encryption.rs b/atuin-client/src/encryption.rs
index ecb8a0c7..5721c2f9 100644
--- a/atuin-client/src/encryption.rs
+++ b/atuin-client/src/encryption.rs
@@ -133,14 +133,11 @@ mod test {
         // test decryption works
         // this should pass
         match decrypt(&e1, &key1) {
-            Err(e) => assert!(false, "failed to decrypt, got {}", e),
+            Err(e) => panic!("failed to decrypt, got {}", e),
             Ok(h) => assert_eq!(h, history),
         };
 
         // this should err
-        match decrypt(&e2, &key1) {
-            Ok(_) => assert!(false, "expected an error decrypting with invalid key"),
-            Err(_) => {}
-        };
+        decrypt(&e2, &key1).expect_err("expected an error decrypting with invalid key");
     }
 }
diff --git a/atuin-client/src/import/resh.rs b/atuin-client/src/import/resh.rs
index fa55300b..c55220ca 100644
--- a/atuin-client/src/import/resh.rs
+++ b/atuin-client/src/import/resh.rs
@@ -73,7 +73,6 @@ pub struct Resh {
     file: BufReader<File>,
     strbuf: String,
     loc: usize,
-    counter: i64,
 }
 
 impl Importer for Resh {
@@ -95,7 +94,6 @@ impl Importer for Resh {
             file: buf,
             strbuf: String::new(),
             loc,
-            counter: 0,
         })
     }
 }
-- 
cgit v1.3.1