update toolchain

rust-toolchain

@@ -1 +1 @@
-nightly
+nightly-2024-01-18

src/kernel/lsm/log.rs

@@ -334,7 +334,7 @@ mod tests {
  .read(true)
  .open(file_path.clone())?;
 
- let data = vec![
+ let data = [
  "abcdefghi".as_bytes().to_vec(), // fits one block of 17
  "123456789012".as_bytes().to_vec(), // spans two blocks of 17
  "0101010101010101010101".as_bytes().to_vec(),

src/kernel/lsm/mem_table.rs

@@ -368,24 +368,26 @@ impl MemTable {
  while let (Some(mem_item), Some(immut_mem_item)) =
  (mem_current.take(), immut_mem_current.take())
  {
- if mem_item.0 < immut_mem_item.0 {
- merged.push(mem_item);
- immut_mem_current = Some(immut_mem_item);
-
- mem_current = mem_iter.next();
- if mem_current.is_none() {
- break;
+ match mem_item.0.cmp(&immut_mem_item.0) {
+ Ordering::Less => {
+ merged.push(mem_item);
+ immut_mem_current = Some(immut_mem_item);
+
+ mem_current = mem_iter.next();
+ if mem_current.is_none() {
+ break;
+ }
  }
- } else if mem_item.0 > immut_mem_item.0 {
- merged.push(immut_mem_item);
- mem_current = Some(mem_item);
-
- immut_mem_current = immut_mem_iter.next();
- if immut_mem_current.is_none() {
- break;
+ Ordering::Greater => {
+ merged.push(immut_mem_item);
+ mem_current = Some(mem_item);
+
+ immut_mem_current = immut_mem_iter.next();
+ if immut_mem_current.is_none() {
+ break;
+ }
  }
- } else {
- merged.push(mem_item);
+ Ordering::Equal => merged.push(mem_item),
  }
  }
 

src/kernel/utils/lru_cache.rs

@@ -73,6 +73,7 @@ impl<K: Hash, V> Hash for KeyRef<K, V> {
 impl<K: Eq, V> Eq for KeyRef<K, V> {}
 
 impl<K: Eq, V> PartialEq<Self> for KeyRef<K, V> {
+ #[allow(clippy::unconditional_recursion)]
  fn eq(&self, other: &Self) -> bool {
  unsafe { self.0.as_ref().key.eq(&other.0.as_ref().key) }
  }

src/lib.rs

@@ -1,7 +1,6 @@
 #![feature(fs_try_exists)]
 #![feature(cursor_remaining)]
 #![feature(slice_pattern)]
-#![feature(bound_map)]
 #![feature(is_sorted)]
 
 extern crate core;