Clippy feedback

Author: spacejam

src/config.rs

@@ -696,7 +696,7 @@ impl Config {
         } else {
             #[allow(unsafe_code)]
             unsafe {
-                Err(ge.deref().clone())
+                Err(*ge.deref())
             }
         }
     }

src/db.rs

@@ -146,9 +146,7 @@ impl Db {
     pub fn drop_tree<V: AsRef<[u8]>>(&self, name: V) -> Result<bool> {
         let name_ref = name.as_ref();
         if name_ref == DEFAULT_TREE_ID {
-            return Err(Error::Unsupported(
-                "cannot remove the core structures".into(),
-            ));
+            return Err(Error::Unsupported("cannot remove the default tree"));
         }
         trace!("dropping tree {:?}", name_ref,);
 

src/lib.rs

@@ -162,6 +162,7 @@
         // clippy::wildcard_enum_match_arm,
     )
 )]
+#![allow(clippy::comparison_chain)]
 
 macro_rules! io_fail {
     ($config:expr, $e:expr) => {

src/pagecache/iobuf.rs

@@ -1200,7 +1200,7 @@ pub(in crate::pagecache) fn maybe_seal_and_write_iobuf(
         match iobufs.with_sa(|sa| sa.next(next_lsn)) {
             Ok(ret) => ret,
             Err(e) => {
-                iobufs.set_global_error(e.clone());
+                iobufs.set_global_error(e);
                 return Err(e);
             }
         }

src/pagecache/logger.rs

@@ -118,7 +118,7 @@ impl Log {
         );
 
         if let Err(e) = &ret {
-            self.iobufs.set_global_error(e.clone());
+            self.iobufs.set_global_error(*e);
         }
 
         ret
@@ -169,7 +169,7 @@ impl Log {
         let ret = self.reserve_inner(log_kind, pid, item, None, guard);
 
         if let Err(e) = &ret {
-            self.iobufs.set_global_error(e.clone());
+            self.iobufs.set_global_error(*e);
         }
 
         ret

src/pagecache/mod.rs

@@ -840,7 +840,7 @@ impl PageCache {
             // changing.
             let ts = old.ts() + 1;
 
-            let cache_info = CacheInfo { lsn, pointer, ts };
+            let cache_info = CacheInfo { ts, lsn, pointer };
 
             let mut new_cache_infos =
                 Vec::with_capacity(old.cache_infos.len() + 1);
@@ -944,13 +944,13 @@ impl PageCache {
             'inner: loop {
                 let pg_view = self.inner.get(pid, &guard);
 
-                match &*pg_view.cache_infos {
-                    &[_single_cache_info] => {
+                match *pg_view.cache_infos {
+                    [_single_cache_info] => {
                         let page_state = pg_view.to_page_state();
                         page_states.push(page_state);
                         break 'inner;
                     }
-                    &[_first_of_several, ..] => {
+                    [_first_of_several, ..] => {
                         // If a page has multiple disk locations,
                         // rewrite it to a single one before storing
                         // a single 8-byte pointer to its cold location.
@@ -965,7 +965,7 @@ impl PageCache {
                         }
                         continue 'inner;
                     }
-                    &[] => {
+                    [] => {
                         // there is a benign race with the thread
                         // that is allocating this page. the allocating
                         // thread has not yet written the new page to disk,
@@ -1661,8 +1661,7 @@ impl PageCacheInner {
                 "{:?}",
                 Error::ReportableBug(
                     "failed to retrieve META page \
-                 which should always be present"
-                        .into(),
+                     which should always be present"
                 )
             )
         }
@@ -1684,8 +1683,7 @@ impl PageCacheInner {
                 "{:?}",
                 Error::ReportableBug(
                     "failed to retrieve counter page \
-                 which should always be present"
-                        .into(),
+                     which should always be present"
                 )
             )
         }
@@ -1948,8 +1946,7 @@ impl PageCacheInner {
                 Err(None) => {
                     return Err(Error::ReportableBug(
                         "replacing the META page has failed because \
-                         the pagecache does not think it currently exists."
-                            .into(),
+                         the pagecache does not think it currently exists.",
                     ));
                 }
             }

src/pagecache/snapshot.rs

@@ -310,19 +310,17 @@ fn advance_snapshot(
     #[cfg(feature = "testing")]
     let mut shred_point = None;
 
-    let snapshot = if db_is_empty {
+    if db_is_empty {
         trace!("db is empty, returning default snapshot");
         if snapshot != Snapshot::default() {
             error!("expected snapshot to be Snapshot::default");
             return Err(Error::corruption(None));
         }
-        snapshot
     } else if iter.cur_lsn.is_none() {
         trace!(
             "no recovery progress happened since the last snapshot \
             was generated, returning the previous one"
         );
-        snapshot
     } else {
         let iterated_lsn = iter.cur_lsn.unwrap();
 
@@ -391,8 +389,6 @@ fn advance_snapshot(
         snapshot.stable_lsn = Some(stable_lsn);
         snapshot.active_segment = active_segment;
         snapshot.filter_inner_heap_ids();
-
-        snapshot
     };
 
     trace!("generated snapshot: {:?}", snapshot);

src/threadpool.rs

@@ -268,7 +268,7 @@ pub fn truncate(config: crate::RunningConfig, at: u64) -> OneShot<Result<()>> {
                 .map_err(|e| e.into());
 
             if let Err(e) = &ret {
-                config.set_global_error(e.clone());
+                config.set_global_error(*e);
             }
 
             ret

src/transaction.rs

@@ -544,7 +544,8 @@ impl<E> Transactional<E> for [Tree] {
         });
         if !same_db {
             return Err(Error::Unsupported(
-                "cannot use trees from multiple databases in the same transaction".into(),
+                "cannot use trees from multiple \
+                databases in the same transaction",
             ));
         }
 
@@ -572,7 +573,8 @@ impl<E> Transactional<E> for [&Tree] {
         });
         if !same_db {
             return Err(Error::Unsupported(
-                "cannot use trees from multiple databases in the same transaction".into(),
+                "cannot use trees from multiple \
+                databases in the same transaction",
             ));
         }