Merge pull request #22 from goldwind-ting/feat-deletetraitbound

fix #4: delete bounds in the struct definition

src/cache/axync.rs

@@ -110,8 +110,8 @@ use crate::ttl::{ExpirationMap, Time};
 /// [`Coster`]: trait.Coster.html
 #[cfg_attr(docsrs, doc(cfg(feature = "async")))]
 pub struct AsyncCacheBuilder<
-    K: Hash + Eq,
-    V: Send + Sync + 'static,
+    K,
+    V,
     KH = DefaultKeyBuilder,
     C = DefaultCoster<V>,
     U = DefaultUpdateValidator<V>,
@@ -233,11 +233,6 @@ impl<K, V, KH, C, U, CB, S> AsyncCacheBuilder<K, V, KH, C, U, CB, S>
 }
 
 pub(crate) struct CacheProcessor<V, U, CB, S>
-    where
-        V: Send + Sync + 'static,
-        U: UpdateValidator<V>,
-        CB: CacheCallback<V>,
-        S: BuildHasher + Clone + 'static,
 {
     insert_buf_rx: Receiver<Item<V>>,
     stop_rx: Receiver<()>,
@@ -253,13 +248,7 @@ pub(crate) struct CacheProcessor<V, U, CB, S>
     cleanup_duration: Duration,
 }
 
-pub(crate) struct CacheCleaner<'a, V, U, CB, S>
-    where
-        V: Send + Sync + 'static,
-        U: UpdateValidator<V>,
-        CB: CacheCallback<V>,
-        S: BuildHasher + Clone + 'static,
-{
+pub(crate) struct CacheCleaner<'a, V, U, CB, S>{
     pub(crate) processor: &'a mut CacheProcessor<V, U, CB, S>,
 }
 

src/cache/builder.rs

@@ -9,8 +9,8 @@ use std::marker::PhantomData;
 use std::time::Duration;
 
 pub struct CacheBuilderCore<
-    K: Hash + Eq,
-    V: Send + Sync + 'static,
+    K,
+    V,
     KH = DefaultKeyBuilder,
     C = DefaultCoster<V>,
     U = DefaultUpdateValidator<V>,

src/cache/sync.rs

@@ -116,8 +116,8 @@ use std::time::Duration;
 /// [`CacheCallback`]: trait.CacheCallback.html
 /// [`Coster`]: trait.Coster.html
 pub struct CacheBuilder<
-    K: Hash + Eq,
-    V: Send + Sync + 'static,
+    K,
+    V,
     KH = DefaultKeyBuilder,
     C = DefaultCoster<V>,
     U = DefaultUpdateValidator<V>,
@@ -286,13 +286,7 @@ impl<V> Item<V> {
     }
 }
 
-pub(crate) struct CacheProcessor<V, U, CB, S>
-where
-    V: Send + Sync + 'static,
-    U: UpdateValidator<V>,
-    CB: CacheCallback<V>,
-    S: BuildHasher + Clone + 'static + Send,
-{
+pub(crate) struct CacheProcessor<V, U, CB, S>{
     pub(crate) insert_buf_rx: Receiver<Item<V>>,
     pub(crate) stop_rx: Receiver<()>,
     pub(crate) clear_rx: UnboundedReceiver<()>,
@@ -307,13 +301,7 @@ where
     pub(crate) cleanup_duration: Duration,
 }
 
-pub(crate) struct CacheCleaner<'a, V, U, CB, S>
-where
-    V: Send + Sync + 'static,
-    U: UpdateValidator<V>,
-    CB: CacheCallback<V>,
-    S: BuildHasher + Clone + 'static + Send,
-{
+pub(crate) struct CacheCleaner<'a, V, U, CB, S>{
     pub(crate) processor: &'a mut CacheProcessor<V, U, CB, S>,
 }
 
@@ -346,10 +334,7 @@ pub struct Cache<
     U = DefaultUpdateValidator<V>,
     CB = DefaultCacheCallback<V>,
     S = RandomState,
-> where
-    K: Hash + Eq,
-    V: Send + Sync + 'static,
-{
+>{
     /// store is the central concurrent hashmap where key-value items are stored.
     pub(crate) store: Arc<ShardedMap<V, U, S, S>>,
 

src/cache/test.rs

@@ -696,15 +696,14 @@ mod sync_test {
     fn test_valueref_ttl() {
         let ttl = Duration::from_secs(1);
         let c = Cache::builder(100, 1000)
-        .set_key_builder(TransparentKeyBuilder::default())
-        .set_metrics(true)
-        .finalize()
-        .unwrap();
+            .set_key_builder(TransparentKeyBuilder::default())
+            .set_metrics(true)
+            .finalize()
+            .unwrap();
         c.try_insert_with_ttl(1, 1, 1, ttl).unwrap();
         c.wait().unwrap();
         let val = c.get(&1).unwrap();
-        assert!(val.ttl()>Duration::from_millis(900));
-
+        assert!(val.ttl() > Duration::from_millis(900));
     }
 }
 

src/lib.rs

@@ -324,7 +324,7 @@ pub trait UpdateValidator<V>: Send + Sync + 'static {
 
 /// DefaultUpdateValidator is a noop update validator.
 #[doc(hidden)]
-pub struct DefaultUpdateValidator<V: Send + Sync> {
+pub struct DefaultUpdateValidator<V> {
     _marker: PhantomData<fn(V)>,
 }
 
@@ -501,7 +501,7 @@ pub trait TransparentKey: Hash + Eq {
 /// [`DefaultKeyBuilder`]: struct.DefaultKeyBuilder.html
 /// [`TransparentKey`]: trait.TransparentKey.html
 #[derive(Default, Copy, Clone, Eq, PartialEq, Debug)]
-pub struct TransparentKeyBuilder<K: TransparentKey> {
+pub struct TransparentKeyBuilder<K> {
     _marker: PhantomData<K>,
 }
 

src/policy.rs

@@ -23,8 +23,8 @@ const DEFAULT_SAMPLES: usize = 5;
 
 macro_rules! impl_policy {
     ($policy: ident) => {
-        use crate::policy::DEFAULT_SAMPLES;
         use crate::policy::PolicyPair;
+        use crate::policy::DEFAULT_SAMPLES;
 
         impl $policy {
             #[inline]

src/policy/axync.rs

@@ -78,7 +78,7 @@ impl<S: BuildHasher + Clone + 'static> AsyncLFUPolicy<S> {
     }
 }
 
-pub(crate) struct PolicyProcessor<S: BuildHasher + Clone + 'static> {
+pub(crate) struct PolicyProcessor<S> {
     inner: Arc<Mutex<PolicyInner<S>>>,
     items_rx: UnboundedReceiver<Vec<u64>>,
     stop_rx: Receiver<()>,

src/policy/sync.rs

@@ -82,7 +82,7 @@ impl<S: BuildHasher + Clone + 'static> LFUPolicy<S> {
     }
 }
 
-pub(crate) struct PolicyProcessor<S: BuildHasher + Clone + 'static> {
+pub(crate) struct PolicyProcessor<S> {
     inner: Arc<Mutex<PolicyInner<S>>>,
     items_rx: UnboundedReceiver<Vec<u64>>,
     stop_rx: Receiver<()>,

src/store.rs

@@ -34,12 +34,7 @@ impl<V> Debug for StoreItem<V> {
 
 type Shards<V, SS> = Box<[RwLock<HashMap<u64, StoreItem<V>, SS>>; NUM_OF_SHARDS]>;
 
-pub(crate) struct ShardedMap<
-    V: Send + Sync + 'static,
-    U = DefaultUpdateValidator<V>,
-    SS = RandomState,
-    ES = RandomState,
-> {
+pub(crate) struct ShardedMap<V, U = DefaultUpdateValidator<V>, SS = RandomState, ES = RandomState> {
     shards: Shards<V, SS>,
     em: ExpirationMap<ES>,
     store_item_size: usize,