Merge #77

77: Fix clippy lints r=CAD97 a=CAD97



Co-authored-by: CAD97 <cad97@cad97.com>

Author: bors[bot]

.github/workflows/ci.yaml

@@ -15,18 +15,18 @@ env:
 
 jobs:
   cargo-test:
-    name: Tests (beta)
+    name: Tests
     if: ${{ github.event.pusher.name == 'bors[bot]' }}
     runs-on: ubuntu-latest
     steps:
 
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Install beta toolchain
+      - name: Install toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: beta
+          toolchain: 1.59.0
           profile: minimal
           override: true
 
@@ -56,7 +56,7 @@ jobs:
       - name: Install arbitrary nightly toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2020-01-01
+          toolchain: nightly-2022-01-01
           profile: minimal
 
       - name: Install msrv toolchain
@@ -69,7 +69,7 @@ jobs:
       - name: Generate minimal-versions lockfile
         uses: actions-rs/cargo@v1
         with:
-          command: +nightly-2020-01-01
+          command: +nightly-2022-01-01
           args: -Z minimal-versions generate-lockfile
 
       - name: Enable caching
@@ -95,11 +95,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Install beta toolchain
+      - name: Instal toolchain
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: beta
+          toolchain: 1.59.0
           override: true
           components: rustfmt
 
@@ -121,7 +121,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: beta
+          toolchain: 1.59.0
           override: true
           components: clippy
 

bors.toml

@@ -2,7 +2,7 @@ cut-body-after = "---"
 delete-merged-branches = true
 
 status = [
-  "Tests (beta)",
+  "Tests",
   "Tests (1.41.0)",
   "Formatting",
   "Lints",

crates/erasable/src/lib.rs

@@ -191,6 +191,10 @@ pub unsafe trait ErasablePtr {
 ///
 /// This trait is automatically implemented for all sized types,
 /// and can be manually implemented for unsized types that know their own metadata.
+///
+/// # Safety
+///
+/// Must be implemented as described and may be relied upon by generic code.
 pub unsafe trait Erasable {
     /// Turn this erasable pointer into an erased pointer.
     ///

crates/ptr-union/src/lib.rs

@@ -439,18 +439,20 @@ macro_rules! impl_union {
                 unset_any_tag(self.raw, $mask)
             }
 
-            /// Dereference the current pointer.
-            ///
-            /// Performs a dynamic alignment check on the dereferenced pointer.
-            pub fn try_deref<'a>(&'a self) -> Option<$Union<$(&'a $A::Target),*>>
-            where
-                $($A: Deref,)*
-                $(&'a $A::Target: ErasablePtr,)*
-            {
-                $(if let Some(this) = self.$a() {
-                    paste::paste! { $Union::[<new_ $a>](this).ok() }
-                } else)* {
-                    None
+            paste::paste! {
+                /// Dereference the current pointer.
+                ///
+                /// Performs a dynamic alignment check on the dereferenced pointer.
+                pub fn try_deref<'a>(&'a self) -> Option<$Union<$(&'a $A::Target),*>>
+                where
+                    $($A: Deref,)*
+                    $(&'a $A::Target: ErasablePtr,)*
+                {
+                    $(if let Some(this) = self.$a() {
+                        $Union::[<new_ $a>](this).ok()
+                    } else)* {
+                        None
+                    }
                 }
             }
         }
@@ -463,9 +465,9 @@ macro_rules! impl_union {
                 }
             }
 
-            /// Pack this loose enum into a pointer union.
-            pub fn try_pack(self) -> Result<$Union<$($A),*>, Self> {
-                paste::paste! {
+            paste::paste! {
+                /// Pack this loose enum into a pointer union.
+                pub fn try_pack(self) -> Result<$Union<$($A),*>, Self> {
                     match self {
                         $($Enum::$A(this) => $Union::[<new_ $a>](this).map_err(Self::$A),)*
                     }

crates/slice-dst/src/layout_polyfill.rs

@@ -8,7 +8,7 @@ use core::{
 #[inline]
 pub(crate) fn extend_layout(this: &Layout, next: Layout) -> Result<(Layout, usize), LayoutErr> {
     let new_align = cmp::max(this.align(), next.align());
-    let pad = layout_padding_needed_for(&this, next.align());
+    let pad = layout_padding_needed_for(this, next.align());
     let offset = this.size().checked_add(pad).ok_or_else(layout_err)?;
     let new_size = offset.checked_add(next.size()).ok_or_else(layout_err)?;
     let layout = Layout::from_size_align(new_size, new_align)?;

crates/slice-dst/src/lib.rs

@@ -158,6 +158,10 @@ use {
 ///
 /// Unless you are making a custom slice DST that needs to pack its length extremely well,
 /// then you should just use [`SliceWithHeader`] instead.
+///
+/// # Safety
+///
+/// Must be implemented as described and may be relied upon by generic code.
 pub unsafe trait SliceDst {
     /// Get the layout of the slice-containing type with the given slice length.
     fn layout_for(len: usize) -> Layout;
@@ -263,6 +267,10 @@ where
 ///
 /// This is not a blanket impl due to coherence rules; if the blanket impl were present,
 /// it would be impossible to implement `AllocSliceDst` instead of `TryAllocSliceDst`.
+///
+/// # Safety
+///
+/// Must be implemented as described and may be relied upon by generic code.
 pub unsafe trait AllocSliceDst<S: ?Sized + SliceDst> {
     /// Create a new custom slice DST.
     ///
@@ -297,6 +305,10 @@ macro_rules! impl_alloc_by_try_alloc {
 
 /// Types that can allocate a custom slice DST within them,
 /// given a fallible initialization function.
+///
+/// # Safety
+///
+/// Must be implemented as described and may be relied upon by generic code.
 pub unsafe trait TryAllocSliceDst<S: ?Sized + SliceDst>: AllocSliceDst<S> + Sized {
     /// Create a new custom slice DST with a fallible initialization function.
     ///