Merge #982

982: chore: fix CI r=taiki-e a=Jules-Bertholet

CI needs to be appeased, it seems.

Co-authored-by: Jules Bertholet <[email protected]>

Author: bors[bot]

crossbeam-channel/tests/mpsc.rs

@@ -20,11 +20,7 @@
 //!   - https://github.com/rust-lang/rust/blob/master/COPYRIGHT
 //!   - https://www.rust-lang.org/en-US/legal.html
 
-#![allow(
-    clippy::drop_copy,
-    clippy::match_single_binding,
-    clippy::redundant_clone
-)]
+#![allow(clippy::match_single_binding, clippy::redundant_clone)]
 
 use std::sync::mpsc::{RecvError, RecvTimeoutError, TryRecvError};
 use std::sync::mpsc::{SendError, TrySendError};

crossbeam-channel/tests/ready.rs

@@ -1,7 +1,5 @@
 //! Tests for channel readiness using the `Select` struct.
 
-#![allow(clippy::drop_copy)]
-
 use std::any::Any;
 use std::cell::Cell;
 use std::thread;

crossbeam-channel/tests/select.rs

@@ -1,7 +1,5 @@
 //! Tests for channel selection using the `Select` struct.
 
-#![allow(clippy::drop_copy)]
-
 use std::any::Any;
 use std::cell::Cell;
 use std::thread;

crossbeam-channel/tests/select_macro.rs

@@ -1,7 +1,7 @@
 //! Tests for the `select!` macro.
 
 #![forbid(unsafe_code)] // select! is safe.
-#![allow(clippy::drop_copy, clippy::match_single_binding)]
+#![allow(clippy::match_single_binding)]
 
 use std::any::Any;
 use std::cell::Cell;
@@ -1212,32 +1212,32 @@ fn result_types() {
     let (_, r) = bounded::<i32>(0);
 
     select! {
-        recv(r) -> res => drop::<Result<i32, RecvError>>(res),
+        recv(r) -> res => { let _: Result<i32, RecvError> = res; },
     }
     select! {
-        recv(r) -> res => drop::<Result<i32, RecvError>>(res),
+        recv(r) -> res =>  { let _: Result<i32, RecvError> = res; },
         default => {}
     }
     select! {
-        recv(r) -> res => drop::<Result<i32, RecvError>>(res),
+        recv(r) -> res =>  { let _: Result<i32, RecvError> = res; },
         default(ms(0)) => {}
     }
 
     select! {
-        send(s, 0) -> res => drop::<Result<(), SendError<i32>>>(res),
+        send(s, 0) -> res => { let _: Result<(), SendError<i32>> = res; },
     }
     select! {
-        send(s, 0) -> res => drop::<Result<(), SendError<i32>>>(res),
+        send(s, 0) -> res =>  { let _: Result<(), SendError<i32>> = res; },
         default => {}
     }
     select! {
-        send(s, 0) -> res => drop::<Result<(), SendError<i32>>>(res),
+        send(s, 0) -> res =>  { let _: Result<(), SendError<i32>> = res; },
         default(ms(0)) => {}
     }
 
     select! {
-        send(s, 0) -> res => drop::<Result<(), SendError<i32>>>(res),
-        recv(r) -> res => drop::<Result<i32, RecvError>>(res),
+        send(s, 0) -> res =>  { let _: Result<(), SendError<i32>> = res; },
+        recv(r) -> res => { let _: Result<i32, RecvError> = res; },
     }
 }
 

crossbeam-epoch/src/deferred.rs

@@ -89,18 +89,17 @@ impl Deferred {
 
 #[cfg(all(test, not(crossbeam_loom)))]
 mod tests {
-    #![allow(clippy::drop_copy)]
-
     use super::Deferred;
     use std::cell::Cell;
+    use std::convert::identity;
 
     #[test]
     fn on_stack() {
         let fired = &Cell::new(false);
         let a = [0usize; 1];
 
         let d = Deferred::new(move || {
-            drop(a);
+            let _ = identity(a);
             fired.set(true);
         });
 
@@ -115,7 +114,7 @@ mod tests {
         let a = [0usize; 10];
 
         let d = Deferred::new(move || {
-            drop(a);
+            let _ = identity(a);
             fired.set(true);
         });
 

crossbeam-skiplist/src/base.rs

@@ -1768,10 +1768,10 @@ impl<'a, K: 'a, V: 'a> RefIter<'a, K, V> {
     /// Decrements the reference count of `RefEntry` owned by the iterator.
     pub fn drop_impl(&mut self, guard: &Guard) {
         self.parent.check_guard(guard);
-        if let Some(e) = mem::replace(&mut self.head, None) {
+        if let Some(e) = self.head.take() {
             unsafe { e.node.decrement(guard) };
         }
-        if let Some(e) = mem::replace(&mut self.tail, None) {
+        if let Some(e) = self.tail.take() {
             unsafe { e.node.decrement(guard) };
         }
     }
@@ -1985,10 +1985,10 @@ where
     /// Decrements a reference count owned by this iterator.
     pub fn drop_impl(&mut self, guard: &Guard) {
         self.parent.check_guard(guard);
-        if let Some(e) = mem::replace(&mut self.head, None) {
+        if let Some(e) = self.head.take() {
             unsafe { e.node.decrement(guard) };
         }
-        if let Some(e) = mem::replace(&mut self.tail, None) {
+        if let Some(e) = self.tail.take() {
             unsafe { e.node.decrement(guard) };
         }
     }

crossbeam-utils/src/sync/sharded_lock.rs

@@ -356,7 +356,7 @@ impl<T: ?Sized> ShardedLock<T> {
             for shard in self.shards[0..i].iter().rev() {
                 unsafe {
                     let dest: *mut _ = shard.write_guard.get();
-                    let guard = mem::replace(&mut *dest, None);
+                    let guard = (*dest).take();
                     drop(guard);
                 }
             }
@@ -526,7 +526,7 @@ impl<T: ?Sized> Drop for ShardedLockWriteGuard<'_, T> {
         for shard in self.lock.shards.iter().rev() {
             unsafe {
                 let dest: *mut _ = shard.write_guard.get();
-                let guard = mem::replace(&mut *dest, None);
+                let guard = (*dest).take();
                 drop(guard);
             }
         }

no_atomic.rs

@@ -19,18 +19,13 @@ const NO_ATOMIC_CAS: &[&str] = &[
 #[allow(dead_code)] // Only crossbeam-utils uses this.
 const NO_ATOMIC_64: &[&str] = &[
     "arm-linux-androideabi",
-    "armebv7r-none-eabi",
-    "armebv7r-none-eabihf",
     "armv4t-none-eabi",
     "armv4t-unknown-linux-gnueabi",
     "armv5te-none-eabi",
     "armv5te-unknown-linux-gnueabi",
     "armv5te-unknown-linux-musleabi",
     "armv5te-unknown-linux-uclibceabi",
     "armv6k-nintendo-3ds",
-    "armv7-sony-vita-newlibeabihf",
-    "armv7r-none-eabi",
-    "armv7r-none-eabihf",
     "avr-unknown-gnu-atmega328",
     "hexagon-unknown-linux-musl",
     "m68k-unknown-linux-gnu",