Merge pull request #1400 from spacejam/tyler_clippy

clippy feedback

Author: spacejam

CHANGELOG.md

@@ -23,7 +23,7 @@
 
 ## Breaking Changes
 
-* #1399 Bump MSRV to 1.51.
+* #1400 Bump MSRV to 1.57.
 * #1399 Thread support is now required on all platforms.
 * #1135 The "no_metrics" anti-feature has been replaced with
   the "metrics" positive feature.

README.md

@@ -161,7 +161,7 @@ extreme::run(async move {
 
 # minimum supported Rust version (MSRV)
 
-We support Rust 1.51.0 and up.
+We support Rust 1.57.0 and up.
 
 # architecture
 

scripts/cross_compile.sh

@@ -12,10 +12,10 @@ rustup update --no-self-update
 
 RUSTFLAGS="--cfg miri" cargo check
 
-rustup toolchain install 1.51.0 --no-self-update
+rustup toolchain install 1.57.0 --no-self-update
 cargo clean
 rm Cargo.lock
-cargo +1.51.0 check
+cargo +1.57.0 check
 
 for target in $targets; do
   echo "setting up $target..."

src/atomic_shim.rs

@@ -116,6 +116,14 @@ mod shim {
             *lock = prev ^ val;
             prev
         }
+
+        #[allow(dead_code)]
+        pub fn fetch_max(&self, val: u64, _: Ordering) -> u64 {
+            let mut lock = self.value.write();
+            let prev = *lock;
+            *lock = prev.max(val);
+            prev
+        }
     }
 
     impl From<u64> for AtomicU64 {
@@ -229,6 +237,14 @@ mod shim {
             *lock = prev ^ val;
             prev
         }
+
+        #[allow(dead_code)]
+        pub fn fetch_max(&self, val: i64, _: Ordering) -> i64 {
+            let mut lock = self.value.write();
+            let prev = *lock;
+            *lock = prev.max(val);
+            prev
+        }
     }
 
     impl From<i64> for AtomicI64 {

src/config.rs

@@ -705,7 +705,6 @@ impl Config {
         let guard = pin();
         let old = self.global_error.swap(Shared::default(), SeqCst, &guard);
         if !old.is_null() {
-            let guard = pin();
             #[allow(unsafe_code)]
             unsafe {
                 guard.defer_destroy(old);
@@ -781,12 +780,12 @@ impl RunningConfig {
     // returns the snapshot file paths for this system
     #[doc(hidden)]
     pub fn get_snapshot_files(&self) -> io::Result<Vec<PathBuf>> {
-        let path = self.get_path().join("snap.");
+        let conf_path = self.get_path().join("snap.");
 
-        let absolute_path: PathBuf = if Path::new(&path).is_absolute() {
-            path
+        let absolute_path: PathBuf = if Path::new(&conf_path).is_absolute() {
+            conf_path
         } else {
-            std::env::current_dir()?.join(path)
+            std::env::current_dir()?.join(conf_path)
         };
 
         let filter = |dir_entry: io::Result<fs::DirEntry>| {

src/db.rs

@@ -107,11 +107,14 @@ impl Db {
     /// accessible from the `Db` via the provided identifier.
     pub fn open_tree<V: AsRef<[u8]>>(&self, name: V) -> Result<Tree> {
         let name_ref = name.as_ref();
-        let tenants = self.tenants.read();
-        if let Some(tree) = tenants.get(name_ref) {
-            return Ok(tree.clone());
+
+        {
+            let tenants = self.tenants.read();
+            if let Some(tree) = tenants.get(name_ref) {
+                return Ok(tree.clone());
+            }
+            drop(tenants);
         }
-        drop(tenants);
 
         let guard = pin();
 

src/debug_delay.rs

@@ -45,9 +45,9 @@ pub fn debug_delay() {
 
     let global_delays = GLOBAL_DELAYS.fetch_add(1, Relaxed);
     let local_delays = LOCAL_DELAYS.with(|ld| {
-        let mut ld = ld.borrow_mut();
-        let old = *ld;
-        *ld = std::cmp::max(global_delays + 1, *ld + 1);
+        let old = *ld.borrow();
+        let new = (global_delays + 1).max(old + 1);
+        *ld.borrow_mut() = new;
         old
     });
 

src/ebr/atomic.rs

@@ -361,9 +361,9 @@ impl<T: ?Sized + Pointable> Atomic<T> {
                 ord.failure(),
             )
             .map(|_| unsafe { Shared::from_usize(new) })
-            .map_err(|current| unsafe {
+            .map_err(|cur| unsafe {
                 CompareAndSetError {
-                    current: Shared::from_usize(current),
+                    current: Shared::from_usize(cur),
                     new: P::from_usize(new),
                 }
             })
@@ -402,9 +402,9 @@ impl<T: ?Sized + Pointable> Atomic<T> {
                 ord.failure(),
             )
             .map(|_| unsafe { Shared::from_usize(new) })
-            .map_err(|current| unsafe {
+            .map_err(|cur| unsafe {
                 CompareAndSetError {
-                    current: Shared::from_usize(current),
+                    current: Shared::from_usize(cur),
                     new: P::from_usize(new),
                 }
             })

src/ebr/internal.rs

@@ -102,7 +102,7 @@ impl Bag {
 
     /// Seals the bag with the given epoch.
     fn seal(self, epoch: Epoch) -> SealedBag {
-        SealedBag { epoch, bag: self }
+        SealedBag { epoch, _bag: self }
     }
 }
 
@@ -217,7 +217,8 @@ const fn no_op_func() {}
 #[derive(Debug)]
 struct SealedBag {
     epoch: Epoch,
-    bag: Bag,
+    // exists solely to be dropped
+    _bag: Bag,
 }
 
 /// It is safe to share `SealedBag` because `is_expired` only inspects the epoch.

src/event_log.rs

@@ -109,18 +109,16 @@ impl EventLog {
                                 .get(&pid)
                                 .unwrap()
                                 .iter()
-                                .map(|ptr| {
-                                    let mut ptr = *ptr;
+                                .map(|ptr_ref| {
+                                    let mut ptr = *ptr_ref;
                                     ptr.forget_heap_log_coordinates();
                                     ptr
                                 })
                                 .collect();
                             let locations_after_restart: Vec<_> = par
                                 .get(&pid)
                                 .unwrap_or_else(|| panic!("pid {} no longer present after restart", pid))
-                                .iter()
-                                .copied()
-                                .collect();
+                                .to_vec();
                             assert_eq!(
                                 locations_before_restart,
                                 locations_after_restart,