Merge crossbeam-rs#525 crossbeam-rs#528

525: add support of a constant initialization routine r=taiki-e a=stlankes helps the compiler to pre-compute some quantities 528: Fix clippy warnings r=taiki-e a=taiki-e Co-authored-by: Stefan Lankes <[email protected]> Co-authored-by: Taiki Endo <[email protected]>
justanotherdot · Jun 5, 2020 · bbc8601 · bbc8601
3 parents 0a1dbee + 5b6d9a7 + 0dafc06
commit bbc8601
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/crossbeam-epoch/src/atomic.rs b/crossbeam-epoch/src/atomic.rs
@@ -832,7 +832,7 @@ impl<T: ?Sized + Pointable> Pointer<T> for Owned<T> {
     unsafe fn from_usize(data: usize) -> Self {
         debug_assert!(data != 0, "converting zero into `Owned`");
         Owned {
-            data: data,
+            data,
             _marker: PhantomData,
         }
     }
@@ -1085,7 +1085,7 @@ impl<T: ?Sized + Pointable> Pointer<T> for Shared<'_, T> {
     #[inline]
     unsafe fn from_usize(data: usize) -> Self {
         Shared {
-            data: data,
+            data,
             _marker: PhantomData,
         }
     }

diff --git a/crossbeam-epoch/src/internal.rs b/crossbeam-epoch/src/internal.rs
@@ -105,9 +105,7 @@ impl Bag {
 }
 
 impl Default for Bag {
-    // TODO(taiki-e): when the minimum supported Rust version is bumped to 1.31+,
-    // replace this with `#[rustfmt::skip]`.
-    #[cfg_attr(rustfmt, rustfmt_skip)]
+    #[rustfmt::skip]
     fn default() -> Self {
         // TODO: [no_op; MAX_OBJECTS] syntax blocked by https://github.com/rust-lang/rust/issues/49147
         #[cfg(not(feature = "sanitize"))]

diff --git a/crossbeam-epoch/src/sync/queue.rs b/crossbeam-epoch/src/sync/queue.rs
@@ -198,7 +198,7 @@ impl<T> Drop for Queue<T> {
         unsafe {
             let guard = unprotected();
 
-            while let Some(_) = self.try_pop(guard) {}
+            while self.try_pop(guard).is_some() {}
 
             // Destroy the remaining sentinel node.
             let sentinel = self.head.load(Relaxed, guard);

diff --git a/crossbeam-utils/src/cache_padded.rs b/crossbeam-utils/src/cache_padded.rs
@@ -90,7 +90,7 @@ impl<T> CachePadded<T> {
     ///
     /// let padded_value = CachePadded::new(1);
     /// ```
-    pub fn new(t: T) -> CachePadded<T> {
+    pub const fn new(t: T) -> CachePadded<T> {
         CachePadded::<T> { value: t }
     }