Additional clippy's from nightly

Author: sigaloid

src/ebr/deferred.rs

@@ -91,7 +91,7 @@ mod tests {
     #[test]
     fn on_stack() {
         let fired = &Cell::new(false);
-        let a = [0usize; 1];
+        let a = [0_usize; 1];
 
         let d = Deferred::new(move || {
             drop(a);
@@ -106,7 +106,7 @@ mod tests {
     #[test]
     fn on_heap() {
         let fired = &Cell::new(false);
-        let a = [0usize; 10];
+        let a = [0_usize; 10];
 
         let d = Deferred::new(move || {
             drop(a);

src/node.rs

@@ -2759,15 +2759,15 @@ mod test {
                 };
 
                 let shrink_hi = if let Some(hi) = node.hi() {
-                    let new_hi = if !node.is_empty() {
+                    let new_hi = if node.is_empty() {
+                        Some(&hi[..hi.len() - 1])
+                    } else {
                         let max_k = node.index_key(node.children() - 1);
                         if max_k >= hi[..hi.len() - 1] {
                             None
                         } else {
                             Some(&hi[..hi.len() - 1])
                         }
-                    } else {
-                        Some(&hi[..hi.len() - 1])
                     };
 
                     Some(Inner::new(

src/pagecache/logger.rs

@@ -159,7 +159,7 @@ impl Log {
                 );
 
                 if let Err(e) = &ret {
-                    self.iobufs.set_global_error(e.clone());
+                    self.iobufs.set_global_error(*e);
                 }
 
                 return ret;

tests/test_crash_recovery.rs

@@ -26,7 +26,7 @@ const BATCHES_DIR: &str = "crash_batches";
 const ITER_DIR: &str = "crash_iter";
 const TX_DIR: &str = "crash_tx";
 
-const TESTS: [(&'static str, fn()); 4] = [
+const TESTS: [(&str, fn()); 4] = [
     (RECOVERY_DIR, crash_recovery),
     (BATCHES_DIR, crash_batches),
     (ITER_DIR, concurrent_crash_iter),
@@ -47,7 +47,7 @@ fn main() {
     match env::var(TEST_ENV_VAR) {
         Err(VarError::NotPresent) => {
             let filtered: Vec<(&'static str, fn())> =
-                if let Some(filter) = std::env::args().skip(1).next() {
+                if let Some(filter) = std::env::args().nth(1) {
                     TESTS
                         .iter()
                         .filter(|(name, _)| name.contains(&filter))
@@ -69,7 +69,7 @@ fn main() {
             let mut tests = vec![];
             for (test_name, test_fn) in filtered.into_iter() {
                 let test = thread::spawn(move || {
-                    let res = std::panic::catch_unwind(|| test_fn());
+                    let res = std::panic::catch_unwind(test_fn);
                     println!(
                         "test {} ... {}",
                         test_name,

tests/test_log.rs

@@ -270,12 +270,12 @@ fn log_aborts() {
     let config = Config::new().temporary(true);
     let db = config.open().unwrap();
     let log = &db.context.pagecache.log;
-    write(&log);
-    abort(&log);
-    write(&log);
-    abort(&log);
-    write(&log);
-    abort(&log);
+    write(log);
+    abort(log);
+    write(log);
+    abort(log);
+    write(log);
+    abort(log);
 }
 
 #[test]
@@ -357,9 +357,9 @@ fn multi_segment_log_iteration() -> Result<()> {
     db.flush().unwrap();
 
     // start iterating just past the first segment header
-    let mut iter = log.iter_from(SEG_HEADER_LEN as Lsn);
+    let iter = log.iter_from(SEG_HEADER_LEN as Lsn);
 
-    while let Some((_, pid, _, _)) = iter.next() {
+    for (_, pid, _, _) in iter {
         if pid <= 3 {
             // this page is for the meta page, counter page, or the default
             // tree's leaf or index nodes

tests/test_tree_failpoints.rs

@@ -485,10 +485,7 @@ fn run_tree_crashes_nicely(ops: Vec<Op>, flusher: bool) -> bool {
                     if reference_entry.versions.len() > 1
                         && reference_entry.crash_epoch == crash_counter
                     {
-                        let last = std::mem::replace(
-                            &mut reference_entry.versions,
-                            Vec::new(),
-                        )
+                        let last = std::mem::take(&mut reference_entry.versions)
                         .pop()
                         .unwrap();
                         reference_entry.versions.push(last);

tests/tree/mod.rs

@@ -332,9 +332,9 @@ fn prop_tree_matches_btreemap_inner(
                         .map(Result::unwrap);
                     let ref_iter = reference
                         .iter()
-                        .filter(|&(ref rk, _rv)| **rk >= k)
+                        .filter(|&(rk, _rv)| *rk >= k)
                         .take(len.abs().try_into().unwrap())
-                        .map(|(ref rk, ref rv)| (rk.0.clone(), **rv));
+                        .map(|(rk, rv)| (rk.0.clone(), *rv));
 
                     for r in ref_iter {
                         let tree_next = tree_iter.next().unwrap();
@@ -358,9 +358,9 @@ fn prop_tree_matches_btreemap_inner(
                     let ref_iter = reference
                         .iter()
                         .rev()
-                        .filter(|&(ref rk, _rv)| **rk >= k)
+                        .filter(|&(rk, _rv)| *rk >= k)
                         .take(len.abs().try_into().unwrap())
-                        .map(|(ref rk, ref rv)| (rk.0.clone(), **rv));
+                        .map(|(rk, rv)| (rk.0.clone(), *rv));
 
                     for r in ref_iter {
                         let tree_next = tree_iter.next().unwrap();