Merge #765

765: Apply clippy to tests and examples r=taiki-e a=taiki-e

I intentionally allow some lint for the same reason as described in #696.

Co-authored-by: Taiki Endo <te316e89@gmail.com>

.github/workflows/ci.yml

@@ -20,7 +20,6 @@ defaults:
 jobs:
   # Test crates on their minimum Rust versions and nightly Rust.
   test:
-    name: test
     env:
       RUST_VERSION: ${{ matrix.rust }}
       RUST_TARGET: ${{ matrix.target }}
@@ -60,7 +59,6 @@ jobs:
 
   # Check all feature combinations works properly.
   features:
-    name: features
     env:
       RUST_VERSION: ${{ matrix.rust }}
     strategy:
@@ -80,7 +78,6 @@ jobs:
 
   # Check for duplicate dependencies.
   dependencies:
-    name: dependencies
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -105,7 +102,6 @@ jobs:
 
   # Check formatting.
   rustfmt:
-    name: rustfmt
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -116,7 +112,6 @@ jobs:
 
   # Check clippy.
   clippy:
-    name: clippy
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -127,16 +122,16 @@ jobs:
 
   # Run miri.
   miri:
-    name: miri
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Install Rust
+        run: rustup toolchain install nightly --component miri && rustup default nightly
       - name: miri
         run: ./ci/miri.sh
 
   # Run sanitizers.
   san:
-    name: san
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -147,7 +142,6 @@ jobs:
 
   # Run loom tests.
   loom:
-    name: loom
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -158,7 +152,6 @@ jobs:
 
   # Check if the document can be generated without warning.
   docs:
-    name: docs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

ci/clippy.sh

@@ -5,4 +5,4 @@ set -ex
 
 rustup component add clippy
 
-cargo clippy --all
+cargo clippy --all --tests --examples

ci/miri.sh

@@ -3,11 +3,6 @@
 cd "$(dirname "$0")"/..
 set -ex
 
-toolchain=nightly-$(curl -s https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu/miri)
-rustup set profile minimal
-rustup default "$toolchain"
-rustup component add miri
-
 MIRIFLAGS="-Zmiri-tag-raw-pointers" \
     cargo miri test \
         -p crossbeam-queue

crossbeam-channel/benches/crossbeam.rs

@@ -13,7 +13,7 @@ mod unbounded {
 
     #[bench]
     fn create(b: &mut Bencher) {
-        b.iter(|| unbounded::<i32>());
+        b.iter(unbounded::<i32>);
     }
 
     #[bench]

crossbeam-channel/tests/golang.rs

@@ -9,6 +9,8 @@
 //!   - https://golang.org/LICENSE
 //!   - https://golang.org/PATENTS
 
+#![allow(clippy::mutex_atomic, clippy::redundant_clone)]
+
 use std::alloc::{GlobalAlloc, Layout, System};
 use std::any::Any;
 use std::cell::Cell;
@@ -710,9 +712,7 @@ mod select2 {
         fn receiver(c: &Chan<i32>, dummy: &Chan<i32>, n: i32) {
             for _ in 0..n {
                 select! {
-                    recv(c.rx()) -> _ => {
-                        ()
-                    }
+                    recv(c.rx()) -> _ => {}
                     recv(dummy.rx()) -> _ => {
                         panic!("dummy");
                     }

crossbeam-channel/tests/mpsc.rs

@@ -20,6 +20,12 @@
 //!   - 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
+)]
+
 use std::sync::mpsc::{RecvError, RecvTimeoutError, TryRecvError};
 use std::sync::mpsc::{SendError, TrySendError};
 use std::thread::JoinHandle;
@@ -344,10 +350,7 @@ mod channel_tests {
             for _ in 0..AMT * NTHREADS {
                 assert_eq!(rx.recv().unwrap(), 1);
             }
-            match rx.try_recv() {
-                Ok(..) => panic!(),
-                _ => {}
-            }
+            assert!(rx.try_recv().is_err());
         });
 
         let mut ts = Vec::with_capacity(NTHREADS as usize);
@@ -1203,10 +1206,7 @@ mod sync_channel_tests {
             for _ in 0..AMT * NTHREADS {
                 assert_eq!(rx.recv().unwrap(), 1);
             }
-            match rx.try_recv() {
-                Ok(..) => panic!(),
-                _ => {}
-            }
+            assert!(rx.try_recv().is_err());
             dtx.send(()).unwrap();
         });
 

crossbeam-channel/tests/ready.rs

@@ -1,5 +1,7 @@
 //! 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,5 +1,7 @@
 //! 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,6 +1,7 @@
 //! Tests for the `select!` macro.
 
 #![forbid(unsafe_code)] // select! is safe.
+#![allow(clippy::drop_copy, clippy::match_single_binding)]
 
 use std::any::Any;
 use std::cell::Cell;
@@ -943,6 +944,7 @@ fn fairness_send() {
     assert!(hits.iter().all(|x| *x >= COUNT / 4));
 }
 
+#[allow(clippy::or_fun_call)] // This is intentional.
 #[test]
 fn references() {
     let (s, r) = unbounded::<i32>();
@@ -989,6 +991,7 @@ fn case_blocks() {
     drop(s);
 }
 
+#[allow(clippy::redundant_closure_call)] // This is intentional.
 #[test]
 fn move_handles() {
     let (s, r) = unbounded::<i32>();

crossbeam-deque/tests/fifo.rs

@@ -341,7 +341,7 @@ fn destructors() {
     {
         let mut v = dropped.lock().unwrap();
         assert_eq!(v.len(), rem);
-        v.sort();
+        v.sort_unstable();
         for pair in v.windows(2) {
             assert_eq!(pair[0] + 1, pair[1]);
         }

crossbeam-deque/tests/injector.rs

@@ -355,7 +355,7 @@ fn destructors() {
     {
         let mut v = dropped.lock().unwrap();
         assert_eq!(v.len(), rem);
-        v.sort();
+        v.sort_unstable();
         for pair in v.windows(2) {
             assert_eq!(pair[0] + 1, pair[1]);
         }

crossbeam-deque/tests/lifo.rs

@@ -341,7 +341,7 @@ fn destructors() {
     {
         let mut v = dropped.lock().unwrap();
         assert_eq!(v.len(), rem);
-        v.sort();
+        v.sort_unstable();
         for pair in v.windows(2) {
             assert_eq!(pair[0] + 1, pair[1]);
         }

crossbeam-epoch/benches/pin.rs

@@ -8,7 +8,7 @@ use test::Bencher;
 
 #[bench]
 fn single_pin(b: &mut Bencher) {
-    b.iter(|| epoch::pin());
+    b.iter(epoch::pin);
 }
 
 #[bench]

crossbeam-epoch/src/deferred.rs

@@ -81,6 +81,8 @@ impl Deferred {
 
 #[cfg(all(test, not(crossbeam_loom)))]
 mod tests {
+    #![allow(clippy::drop_copy)]
+
     use super::Deferred;
     use std::cell::Cell;
 

crossbeam-epoch/src/sync/queue.rs

@@ -425,8 +425,8 @@ mod test {
 
                     let mut vl2 = vl.clone();
                     let mut vr2 = vr.clone();
-                    vl2.sort();
-                    vr2.sort();
+                    vl2.sort_unstable();
+                    vr2.sort_unstable();
 
                     assert_eq!(vl, vl2);
                     assert_eq!(vr, vr2);

crossbeam-skiplist/tests/base.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::mutex_atomic, clippy::redundant_clone)]
+
 use std::ops::Bound;
 use std::sync::atomic::{AtomicUsize, Ordering};
 

crossbeam-skiplist/tests/map.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::mutex_atomic)]
+
 use std::{iter, ops::Bound, sync::Barrier};
 
 use crossbeam_skiplist::SkipMap;