Merge #777

777: Fix a few minor warnings r=cuviper a=cuviper



Co-authored-by: Josh Stone <[email protected]>

.github/workflows/ci.yaml

@@ -120,7 +120,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.40.0
+          toolchain: 1.45.0
           override: true
           components: rustfmt
       - name: Check formatting

.github/workflows/pr.yaml

@@ -67,7 +67,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.40.0
+          toolchain: 1.45.0
           override: true
           components: rustfmt
       - name: Check formatting

rayon-core/src/lib.rs

@@ -23,6 +23,7 @@
 #![deny(missing_debug_implementations)]
 #![deny(missing_docs)]
 #![deny(unreachable_pub)]
+#![warn(rust_2018_idioms)]
 
 use std::any::Any;
 use std::env;

rayon-core/src/private.rs

@@ -14,13 +14,13 @@ macro_rules! private_decl {
         /// impossible to implement outside the crate.
         #[doc(hidden)]
         fn __rayon_private__(&self) -> crate::private::PrivateMarker;
-    }
+    };
 }
 
 macro_rules! private_impl {
     () => {
         fn __rayon_private__(&self) -> crate::private::PrivateMarker {
             crate::private::PrivateMarker
         }
-    }
+    };
 }

rayon-core/src/sleep/mod.rs

@@ -49,7 +49,7 @@ impl Sleep {
     pub(super) fn work_found(&self, worker_index: usize, yields: usize) -> usize {
         log!(FoundWork {
             worker: worker_index,
-            yields: yields,
+            yields,
         });
         if yields > ROUNDS_UNTIL_SLEEPY {
             // FIXME tickling here is a bit extreme; mostly we want to "release the lock"
@@ -64,7 +64,7 @@ impl Sleep {
     pub(super) fn no_work_found(&self, worker_index: usize, yields: usize) -> usize {
         log!(DidNotFindWork {
             worker: worker_index,
-            yields: yields,
+            yields,
         });
         if yields < ROUNDS_UNTIL_SLEEPY {
             thread::yield_now();
@@ -119,7 +119,7 @@ impl Sleep {
         let old_state = self.state.swap(AWAKE, Ordering::Release);
         log!(Tickle {
             worker: worker_index,
-            old_state: old_state,
+            old_state,
         });
         if self.anyone_sleeping(old_state) {
             let _data = self.data.lock().unwrap();
@@ -138,7 +138,7 @@ impl Sleep {
             let state = self.state.load(Ordering::Acquire);
             log!(GetSleepy {
                 worker: worker_index,
-                state: state,
+                state,
             });
             if self.any_worker_is_sleepy(state) {
                 // somebody else is already sleepy, so we'll just wait our turn
@@ -175,7 +175,7 @@ impl Sleep {
                     log!(GotSleepy {
                         worker: worker_index,
                         old_state: state,
-                        new_state: new_state,
+                        new_state,
                     });
                     return true;
                 }
@@ -264,7 +264,7 @@ impl Sleep {
                     log!(FellAsleep {
                         worker: worker_index
                     });
-                    let _ = self.tickle.wait(data).unwrap();
+                    drop(self.tickle.wait(data).unwrap());
                     log!(GotAwoken {
                         worker: worker_index
                     });

rayon-demo/src/main.rs

@@ -1,4 +1,5 @@
 #![cfg_attr(test, feature(test))]
+#![warn(rust_2018_idioms)]
 
 use std::env;
 use std::io;

src/iter/collect/mod.rs

@@ -86,7 +86,7 @@ impl<'c, T: Send + 'c> Collect<'c, T> {
     /// the vector is complete with the collected result.
     fn with_consumer<F>(mut self, scope_fn: F)
     where
-        F: FnOnce(CollectConsumer<T>) -> CollectResult<T>,
+        F: FnOnce(CollectConsumer<'_, T>) -> CollectResult<'_, T>,
     {
         unsafe {
             let slice = Self::reserve_get_tail_slice(&mut self.vec, self.len);

src/lib.rs

@@ -2,6 +2,7 @@
 #![deny(missing_debug_implementations)]
 #![deny(missing_docs)]
 #![deny(unreachable_pub)]
+#![warn(rust_2018_idioms)]
 
 //! Data-parallelism library that makes it easy to convert sequential
 //! computations into parallel

src/private.rs

@@ -14,13 +14,13 @@ macro_rules! private_decl {
         /// impossible to implement outside the crate.
         #[doc(hidden)]
         fn __rayon_private__(&self) -> crate::private::PrivateMarker;
-    }
+    };
 }
 
 macro_rules! private_impl {
     () => {
         fn __rayon_private__(&self) -> crate::private::PrivateMarker {
             crate::private::PrivateMarker
         }
-    }
+    };
 }

src/slice/mod.rs

@@ -110,7 +110,7 @@ pub trait ParallelSlice<T: Sync> {
         let len = slice.len() - rem;
         let (fst, snd) = slice.split_at(len);
         ChunksExact {
-            chunk_size: chunk_size,
+            chunk_size,
             slice: fst,
             rem: snd,
         }
@@ -199,7 +199,7 @@ pub trait ParallelSliceMut<T: Send> {
         let len = slice.len() - rem;
         let (fst, snd) = slice.split_at_mut(len);
         ChunksExactMut {
-            chunk_size: chunk_size,
+            chunk_size,
             slice: fst,
             rem: snd,
         }