Fix Clippy warnings

clippy 0.1.72 (a47f796a365 2023-07-22)
moka-rs · Jul 29, 2023 · c9a012e · c9a012e
1 parent 202691e
commit c9a012e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/Lints.yml b/.github/workflows/Lints.yml
@@ -16,8 +16,9 @@ jobs:
     strategy:
       matrix:
         rust:
-          - stable
-          - beta
+          - toolchain: stable
+          - toolchain: beta
+            rustflags: '--cfg beta_clippy'
 
     steps:
       - name: Checkout Moka
@@ -27,7 +28,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ matrix.rust }}
+          toolchain: ${{ matrix.rust.toolchain }}
           override: true
           components: rustfmt, clippy
 
@@ -40,16 +41,15 @@ jobs:
 
       - name: Run Clippy
         uses: actions-rs/clippy-check@v1
-        if: ${{ matrix.rust == 'stable' || matrix.rust == 'beta' }}
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          # Specify individual features until we remove `dash` feature.
-          # args: --lib --tests --all-features --all-targets -- -D warnings
-          args: --lib --tests --features 'future, logging, unstable-debug-counters' --all-targets -- -D warnings
+          args: --lib --tests --all-features --all-targets -- -D warnings
+        env:
+          RUSTFLAGS: ${{ matrix.rust.rustflags }}
 
       - name: Run Rustfmt
         uses: actions-rs/cargo@v1
-        if: ${{ matrix.rust == 'stable' }}
+        if: ${{ matrix.rust.toolchain == 'stable' }}
         with:
           command: fmt
           args: --all -- --check
diff --git a/src/notification/notifier.rs b/src/notification/notifier.rs
@@ -159,7 +159,7 @@ impl<K, V> ThreadPoolRemovalNotifier<K, V> {
             is_shutting_down: Default::default(),
         };
 
-        #[allow(clippy::arc_with_non_send_sync)]
+        #[cfg_attr(beta_clippy, allow(clippy::arc_with_non_send_sync))]
         let state = Arc::new(state);
 
         Self {

diff --git a/src/sync_base/base_cache.rs b/src/sync_base/base_cache.rs
@@ -176,7 +176,6 @@ where
         let (r_snd, r_rcv) = crossbeam_channel::bounded(r_size);
         let (w_snd, w_rcv) = crossbeam_channel::bounded(w_size);
 
-        #[allow(clippy::arc_with_non_send_sync)]
         let inner = Arc::new(Inner::new(
             name,
             max_capacity,
@@ -193,13 +192,12 @@ where
         if invalidator_enabled {
             inner.set_invalidator(&inner);
         }
-        #[allow(clippy::arc_with_non_send_sync)]
-        let housekeeper = Arc::new(Housekeeper::new(Arc::downgrade(&inner), housekeeper_conf));
+        let housekeeper = Housekeeper::new(Arc::downgrade(&inner), housekeeper_conf);
         Self {
             inner,
             read_op_ch: r_snd,
             write_op_ch: w_snd,
-            housekeeper: Some(housekeeper),
+            housekeeper: Some(Arc::new(housekeeper)),
         }
     }
 

diff --git a/src/sync_base/invalidator.rs b/src/sync_base/invalidator.rs
@@ -112,7 +112,7 @@ impl<K, V, S> Invalidator<K, V, S> {
         Self {
             predicates: RwLock::new(HashMap::new()),
             is_empty: AtomicBool::new(true),
-            #[allow(clippy::arc_with_non_send_sync)]
+            #[cfg_attr(beta_clippy, allow(clippy::arc_with_non_send_sync))]
             scan_context: Arc::new(ScanContext::new(cache)),
             thread_pool,
         }