chore: bump compiler version and clippy fixes (#105)

Signed-off-by: Alex Chi Z <[email protected]>
skyzh · Dec 9, 2024 · 23802b2 · 23802b2
1 parent f99db4d
commit 23802b2
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 9 deletions.
diff --git a/mini-lsm-mvcc/src/compact/tiered.rs b/mini-lsm-mvcc/src/compact/tiered.rs
@@ -86,15 +86,15 @@ impl TieredCompactionController {
             .len()
             .min(self.options.max_merge_width.unwrap_or(usize::MAX));
         println!("compaction triggered by reducing sorted runs");
-        return Some(TieredCompactionTask {
+        Some(TieredCompactionTask {
             tiers: snapshot
                 .levels
                 .iter()
                 .take(num_tiers_to_take)
                 .cloned()
                 .collect::<Vec<_>>(),
             bottom_tier_included: snapshot.levels.len() >= num_tiers_to_take,
-        });
+        })
     }
 
     pub fn apply_compaction_result(

diff --git a/mini-lsm-mvcc/src/lsm_iterator.rs b/mini-lsm-mvcc/src/lsm_iterator.rs
@@ -129,7 +129,10 @@ impl<I: StorageIterator> FusedIterator<I> {
 }
 
 impl<I: StorageIterator> StorageIterator for FusedIterator<I> {
-    type KeyType<'a> = I::KeyType<'a> where Self: 'a;
+    type KeyType<'a>
+        = I::KeyType<'a>
+    where
+        Self: 'a;
 
     fn is_valid(&self) -> bool {
         !self.has_errored && self.iter.is_valid()

diff --git a/mini-lsm-mvcc/src/mvcc/txn.rs b/mini-lsm-mvcc/src/mvcc/txn.rs
@@ -252,7 +252,10 @@ impl TxnIterator {
 }
 
 impl StorageIterator for TxnIterator {
-    type KeyType<'a> = &'a [u8] where Self: 'a;
+    type KeyType<'a>
+        = &'a [u8]
+    where
+        Self: 'a;
 
     fn value(&self) -> &[u8] {
         self.iter.value()

diff --git a/mini-lsm-starter/src/lsm_iterator.rs b/mini-lsm-starter/src/lsm_iterator.rs
@@ -59,7 +59,10 @@ impl<I: StorageIterator> FusedIterator<I> {
 }
 
 impl<I: StorageIterator> StorageIterator for FusedIterator<I> {
-    type KeyType<'a> = I::KeyType<'a> where Self: 'a;
+    type KeyType<'a>
+        = I::KeyType<'a>
+    where
+        Self: 'a;
 
     fn is_valid(&self) -> bool {
         unimplemented!()

diff --git a/mini-lsm-starter/src/mvcc/txn.rs b/mini-lsm-starter/src/mvcc/txn.rs
@@ -104,7 +104,10 @@ impl TxnIterator {
 }
 
 impl StorageIterator for TxnIterator {
-    type KeyType<'a> = &'a [u8] where Self: 'a;
+    type KeyType<'a>
+        = &'a [u8]
+    where
+        Self: 'a;
 
     fn value(&self) -> &[u8] {
         self.iter.value()

diff --git a/mini-lsm/src/compact/tiered.rs b/mini-lsm/src/compact/tiered.rs
@@ -86,15 +86,15 @@ impl TieredCompactionController {
             .len()
             .min(self.options.max_merge_width.unwrap_or(usize::MAX));
         println!("compaction triggered by reducing sorted runs");
-        return Some(TieredCompactionTask {
+        Some(TieredCompactionTask {
             tiers: snapshot
                 .levels
                 .iter()
                 .take(num_tiers_to_take)
                 .cloned()
                 .collect::<Vec<_>>(),
             bottom_tier_included: snapshot.levels.len() >= num_tiers_to_take,
-        });
+        })
     }
 
     pub fn apply_compaction_result(

diff --git a/mini-lsm/src/lsm_iterator.rs b/mini-lsm/src/lsm_iterator.rs
@@ -99,7 +99,10 @@ impl<I: StorageIterator> FusedIterator<I> {
 }
 
 impl<I: StorageIterator> StorageIterator for FusedIterator<I> {
-    type KeyType<'a> = I::KeyType<'a> where Self: 'a;
+    type KeyType<'a>
+        = I::KeyType<'a>
+    where
+        Self: 'a;
 
     fn is_valid(&self) -> bool {
         !self.has_errored && self.iter.is_valid()