fix CI

al8n · Oct 17, 2023 · caac9c4 · caac9c4
1 parent f7d613c
commit caac9c4
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
     - name: Install cargo-hack
       run: cargo install cargo-hack
     - name: Apply clippy lints
-      run: cargo hack clippy --each-feature
+      run: cargo hack clippy --each-feature --include-features sync,async --exclude-no-default-features
 
   # Run tests on some extra platforms
   cross:
@@ -134,7 +134,7 @@ jobs:
         path: ~/.cargo
         key: ${{ runner.os }}-coverage-dotcargo
     - name: Run build
-      run: cargo hack build --feature-powerset
+      run: cargo hack build --feature-powerset --include-features sync,async --exclude-no-default-features
 
   test:
     name: test
@@ -168,7 +168,7 @@ jobs:
         path: ~/.cargo
         key: ${{ runner.os }}-coverage-dotcargo
     - name: Run test
-      run: cargo hack test --feature-powerset
+      run: cargo hack test --feature-powerset --include-features sync,async --exclude-no-default-features
 
   sanitizer:
     name: sanitizer

diff --git a/ci/miri.sh b/ci/miri.sh
@@ -7,5 +7,5 @@ cargo miri setup
 
 export MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-disable-isolation -Zmiri-symbolic-alignment-check"
 
-cargo hack miri test --each-feature
+cargo hack miri test --each-feature --include-features sync,async --exclude-no-default-features
 
diff --git a/ci/sanitizer.sh b/ci/sanitizer.sh
@@ -14,4 +14,4 @@ cargo hack test --lib --each-feature
 
 # Run thread sanitizer with cargo-hack
 RUSTFLAGS="-Z sanitizer=thread" \
-cargo hack -Zbuild-std test --lib --each-feature
+cargo hack -Zbuild-std test --lib --each-feature --include-features sync,async --exclude-no-default-features
diff --git a/ci/test-stable.sh b/ci/test-stable.sh
diff --git a/src/cache.rs b/src/cache.rs
@@ -198,6 +198,7 @@ macro_rules! impl_builder {
     };
 }
 
+#[cfg(feature = "sync")]
 macro_rules! impl_cache {
     ($cache: ident, $builder: ident, $item: ident) => {
         use crate::store::UpdateResult;

diff --git a/src/cache/builder.rs b/src/cache/builder.rs
@@ -176,7 +176,7 @@ where
     /// This is a fine-tuning mechanism and you probably won't have to touch this.
     #[inline]
     pub fn set_buffer_size(mut self, sz: usize) -> Self {
-            self.insert_buffer_size = sz;
+        self.insert_buffer_size = sz;
         self
     }
 

diff --git a/src/ring.rs b/src/ring.rs
@@ -4,14 +4,17 @@ use parking_lot::Mutex;
 
 #[cfg(feature = "async")]
 use crate::policy::AsyncLFUPolicy;
+#[cfg(feature = "sync")]
 use crate::policy::LFUPolicy;
 
+#[cfg(feature = "sync")]
 pub struct RingStripe<S> {
     cons: Arc<LFUPolicy<S>>,
     data: Mutex<Vec<u64>>,
     capa: usize,
 }
 
+#[cfg(feature = "sync")]
 impl<S> RingStripe<S>
 where
     S: BuildHasher + Clone + 'static,

diff --git a/src/store.rs b/src/store.rs
@@ -1,4 +1,3 @@
-use crate::policy::LFUPolicy;
 use crate::ttl::{ExpirationMap, Time};
 use crate::utils::{change_lifetime_const, SharedValue, ValueRef, ValueRefMut};
 use crate::{CacheError, DefaultUpdateValidator, Item as CrateItem, UpdateValidator};
@@ -238,9 +237,10 @@ impl<
             .map(|val| val.expiration)
     }
 
+    #[cfg(feature = "sync")]
     pub fn try_cleanup<PS: BuildHasher + Clone + 'static>(
         &self,
-        policy: Arc<LFUPolicy<PS>>,
+        policy: Arc<crate::policy::LFUPolicy<PS>>,
     ) -> Result<Vec<CrateItem<V>>, CacheError> {
         let now = Time::now();
         Ok(self