Merge #696

bors[bot] · taiki-e · web-flow · commit 3e83987f258a · 2021-05-04T15:48:58.000Z
696: Fix some clippy warnings in tests and examples r=taiki-e a=taiki-e

I feel that some lints are too strict for test code, so this will only fix some warnings which I think are reasonable.

Co-authored-by: Taiki Endo &lt;te316e89@gmail.com&gt;
diff --git a/crossbeam-channel/examples/fibonacci.rs b/crossbeam-channel/examples/fibonacci.rs
@@ -10,7 +10,7 @@ fn fibonacci(sender: Sender<u64>) {
     while sender.send(x).is_ok() {
         let tmp = x;
         x = y;
-        y = tmp + y;
+        y += tmp;
     }
 }
 
diff --git a/crossbeam-channel/examples/stopwatch.rs b/crossbeam-channel/examples/stopwatch.rs
@@ -33,11 +33,7 @@ fn main() {
 
     // Prints the elapsed time.
     fn show(dur: Duration) {
-        println!(
-            "Elapsed: {}.{:03} sec",
-            dur.as_secs(),
-            dur.subsec_nanos() / 1_000_000
-        );
+        println!("Elapsed: {}.{:03} sec", dur.as_secs(), dur.subsec_millis());
     }
 
     let start = Instant::now();
diff --git a/crossbeam-channel/tests/golang.rs b/crossbeam-channel/tests/golang.rs
@@ -176,7 +176,7 @@ unsafe impl GlobalAlloc for Counter {
         if !ret.is_null() {
             ALLOCATED.fetch_add(layout.size(), SeqCst);
         }
-        return ret;
+        ret
     }
 
     unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
diff --git a/crossbeam-deque/tests/fifo.rs b/crossbeam-deque/tests/fifo.rs
@@ -167,7 +167,7 @@ fn stress() {
                         hits.fetch_add(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         hits.fetch_add(1, SeqCst);
                     }
                 }
@@ -178,7 +178,7 @@ fn stress() {
         let mut expected = 0;
         while expected < COUNT {
             if rng.gen_range(0..3) == 0 {
-                while let Some(_) = w.pop() {
+                while w.pop().is_some() {
                     hits.fetch_add(1, SeqCst);
                 }
             } else {
@@ -188,7 +188,7 @@ fn stress() {
         }
 
         while hits.load(SeqCst) < COUNT {
-            while let Some(_) = w.pop() {
+            while w.pop().is_some() {
                 hits.fetch_add(1, SeqCst);
             }
         }
@@ -227,7 +227,7 @@ fn no_starvation() {
                         hits.fetch_add(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         hits.fetch_add(1, SeqCst);
                     }
                 }
@@ -239,7 +239,7 @@ fn no_starvation() {
         loop {
             for i in 0..rng.gen_range(0..COUNT) {
                 if rng.gen_range(0..3) == 0 && my_hits == 0 {
-                    while let Some(_) = w.pop() {
+                    while w.pop().is_some() {
                         my_hits += 1;
                     }
                 } else {
@@ -300,7 +300,7 @@ fn destructors() {
                         remaining.fetch_sub(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         cnt += 1;
                         remaining.fetch_sub(1, SeqCst);
                     }
@@ -309,7 +309,7 @@ fn destructors() {
         }
 
         for _ in 0..STEPS {
-            if let Some(_) = w.pop() {
+            if w.pop().is_some() {
                 remaining.fetch_sub(1, SeqCst);
             }
         }
diff --git a/crossbeam-deque/tests/injector.rs b/crossbeam-deque/tests/injector.rs
@@ -178,7 +178,7 @@ fn stress() {
                         hits.fetch_add(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         hits.fetch_add(1, SeqCst);
                     }
                 }
@@ -238,7 +238,7 @@ fn no_starvation() {
                         hits.fetch_add(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         hits.fetch_add(1, SeqCst);
                     }
                 }
@@ -311,7 +311,7 @@ fn destructors() {
                         remaining.fetch_sub(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         cnt += 1;
                         remaining.fetch_sub(1, SeqCst);
                     }
diff --git a/crossbeam-deque/tests/lifo.rs b/crossbeam-deque/tests/lifo.rs
@@ -167,7 +167,7 @@ fn stress() {
                         hits.fetch_add(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         hits.fetch_add(1, SeqCst);
                     }
                 }
@@ -178,7 +178,7 @@ fn stress() {
         let mut expected = 0;
         while expected < COUNT {
             if rng.gen_range(0..3) == 0 {
-                while let Some(_) = w.pop() {
+                while w.pop().is_some() {
                     hits.fetch_add(1, SeqCst);
                 }
             } else {
@@ -188,7 +188,7 @@ fn stress() {
         }
 
         while hits.load(SeqCst) < COUNT {
-            while let Some(_) = w.pop() {
+            while w.pop().is_some() {
                 hits.fetch_add(1, SeqCst);
             }
         }
@@ -227,7 +227,7 @@ fn no_starvation() {
                         hits.fetch_add(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         hits.fetch_add(1, SeqCst);
                     }
                 }
@@ -239,7 +239,7 @@ fn no_starvation() {
         loop {
             for i in 0..rng.gen_range(0..COUNT) {
                 if rng.gen_range(0..3) == 0 && my_hits == 0 {
-                    while let Some(_) = w.pop() {
+                    while w.pop().is_some() {
                         my_hits += 1;
                     }
                 } else {
@@ -300,7 +300,7 @@ fn destructors() {
                         remaining.fetch_sub(1, SeqCst);
                     }
 
-                    while let Some(_) = w2.pop() {
+                    while w2.pop().is_some() {
                         cnt += 1;
                         remaining.fetch_sub(1, SeqCst);
                     }
@@ -309,7 +309,7 @@ fn destructors() {
         }
 
         for _ in 0..STEPS {
-            if let Some(_) = w.pop() {
+            if w.pop().is_some() {
                 remaining.fetch_sub(1, SeqCst);
             }
         }
diff --git a/crossbeam-epoch/src/atomic.rs b/crossbeam-epoch/src/atomic.rs
@@ -1545,6 +1545,6 @@ mod tests {
     #[test]
     fn const_atomic_null() {
         use super::Atomic;
-        const _: Atomic<u8> = Atomic::<u8>::null();
+        static _U: Atomic<u8> = Atomic::<u8>::null();
     }
 }
diff --git a/crossbeam-skiplist/tests/base.rs b/crossbeam-skiplist/tests/base.rs
@@ -164,7 +164,7 @@ fn len() {
     assert_eq!(s.len(), 0);
 
     for (i, &x) in [4, 2, 12, 8, 7, 11, 5].iter().enumerate() {
-        s.insert(x, x * 1, guard);
+        s.insert(x, x * 10, guard);
         assert_eq!(s.len(), i + 1);
     }
 
diff --git a/crossbeam-utils/tests/cache_padded.rs b/crossbeam-utils/tests/cache_padded.rs
@@ -85,6 +85,7 @@ fn drops() {
     assert_eq!(count.get(), 2);
 }
 
+#[allow(clippy::clone_on_copy)] // This is intentional.
 #[test]
 fn clone() {
     let a = CachePadded::new(17);
diff --git a/crossbeam-utils/tests/sharded_lock.rs b/crossbeam-utils/tests/sharded_lock.rs
@@ -138,7 +138,7 @@ fn arc() {
 fn arc_access_in_unwind() {
     let arc = Arc::new(ShardedLock::new(1));
     let arc2 = arc.clone();
-    let _ = thread::spawn(move || -> () {
+    let _ = thread::spawn(move || {
         struct Unwinder {
             i: Arc<ShardedLock<isize>>,
         }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ fn fibonacci(sender: Sender<u64>) {`
`10`	`10`	`while sender.send(x).is_ok() {`
`11`	`11`	`let tmp = x;`
`12`	`12`	`x = y;`
`13`		`- y = tmp + y;`
	`13`	`+ y += tmp;`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ unsafe impl GlobalAlloc for Counter {`
`176`	`176`	`if !ret.is_null() {`
`177`	`177`	`ALLOCATED.fetch_add(layout.size(), SeqCst);`
`178`	`178`	`}`
`179`		`- return ret;`
	`179`	`+ ret`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ fn stress() {`
`167`	`167`	`hits.fetch_add(1, SeqCst);`
`168`	`168`	`}`
`169`	`169`
`170`		`- while let Some(_) = w2.pop() {`
	`170`	`+ while w2.pop().is_some() {`
`171`	`171`	`hits.fetch_add(1, SeqCst);`
`172`	`172`	`}`
`173`	`173`	`}`
`@@ -178,7 +178,7 @@ fn stress() {`
`178`	`178`	`let mut expected = 0;`
`179`	`179`	`while expected < COUNT {`
`180`	`180`	`if rng.gen_range(0..3) == 0 {`
`181`		`- while let Some(_) = w.pop() {`
	`181`	`+ while w.pop().is_some() {`
`182`	`182`	`hits.fetch_add(1, SeqCst);`
`183`	`183`	`}`
`184`	`184`	`} else {`
`@@ -188,7 +188,7 @@ fn stress() {`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`while hits.load(SeqCst) < COUNT {`
`191`		`- while let Some(_) = w.pop() {`
	`191`	`+ while w.pop().is_some() {`
`192`	`192`	`hits.fetch_add(1, SeqCst);`
`193`	`193`	`}`
`194`	`194`	`}`
`@@ -227,7 +227,7 @@ fn no_starvation() {`
`227`	`227`	`hits.fetch_add(1, SeqCst);`
`228`	`228`	`}`
`229`	`229`
`230`		`- while let Some(_) = w2.pop() {`
	`230`	`+ while w2.pop().is_some() {`
`231`	`231`	`hits.fetch_add(1, SeqCst);`
`232`	`232`	`}`
`233`	`233`	`}`
`@@ -239,7 +239,7 @@ fn no_starvation() {`
`239`	`239`	`loop {`
`240`	`240`	`for i in 0..rng.gen_range(0..COUNT) {`
`241`	`241`	`if rng.gen_range(0..3) == 0 && my_hits == 0 {`
`242`		`- while let Some(_) = w.pop() {`
	`242`	`+ while w.pop().is_some() {`
`243`	`243`	`my_hits += 1;`
`244`	`244`	`}`
`245`	`245`	`} else {`
`@@ -300,7 +300,7 @@ fn destructors() {`
`300`	`300`	`remaining.fetch_sub(1, SeqCst);`
`301`	`301`	`}`
`302`	`302`
`303`		`- while let Some(_) = w2.pop() {`
	`303`	`+ while w2.pop().is_some() {`
`304`	`304`	`cnt += 1;`
`305`	`305`	`remaining.fetch_sub(1, SeqCst);`
`306`	`306`	`}`
`@@ -309,7 +309,7 @@ fn destructors() {`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`for _ in 0..STEPS {`
`312`		`- if let Some(_) = w.pop() {`
	`312`	`+ if w.pop().is_some() {`
`313`	`313`	`remaining.fetch_sub(1, SeqCst);`
`314`	`314`	`}`
`315`	`315`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1545,6 +1545,6 @@ mod tests {`
`1545`	`1545`	`#[test]`
`1546`	`1546`	`fn const_atomic_null() {`
`1547`	`1547`	`use super::Atomic;`
`1548`		`- const _: Atomic<u8> = Atomic::<u8>::null();`
	`1548`	`+ static _U: Atomic<u8> = Atomic::<u8>::null();`
`1549`	`1549`	`}`
`1550`	`1550`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ fn len() {`
`164`	`164`	`assert_eq!(s.len(), 0);`
`165`	`165`
`166`	`166`	`for (i, &x) in [4, 2, 12, 8, 7, 11, 5].iter().enumerate() {`
`167`		`- s.insert(x, x * 1, guard);`
	`167`	`+ s.insert(x, x * 10, guard);`
`168`	`168`	`assert_eq!(s.len(), i + 1);`
`169`	`169`	`}`
`170`	`170`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ fn drops() {`
`85`	`85`	`assert_eq!(count.get(), 2);`
`86`	`86`	`}`
`87`	`87`
	`88`	`+#[allow(clippy::clone_on_copy)] // This is intentional.`
`88`	`89`	`#[test]`
`89`	`90`	`fn clone() {`
`90`	`91`	`let a = CachePadded::new(17);`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ fn arc() {`
`138`	`138`	`fn arc_access_in_unwind() {`
`139`	`139`	`let arc = Arc::new(ShardedLock::new(1));`
`140`	`140`	`let arc2 = arc.clone();`
`141`		`- let _ = thread::spawn(move \|\| -> () {`
	`141`	`+ let _ = thread::spawn(move \|\| {`
`142`	`142`	`struct Unwinder {`
`143`	`143`	`i: Arc<ShardedLock<isize>>,`
`144`	`144`	`}`