improve: change cachedapi to use generic

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "casbin"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Joey <[email protected]>", "Cheng JIANG <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"

README.md

@@ -29,7 +29,7 @@ Add this package to `Cargo.toml` of your project. (Check https://crates.io/crate
 
 ```toml
 [dependencies]
-casbin = { version = "2.0.0", default-features = false, features = ["runtime-async-std", "logging"] }
+casbin = { version = "2.0.1", default-features = false, features = ["runtime-async-std", "logging"] }
 async-std = { version = "1.5.0", features = ["attributes"] }
 ```
 

src/cached_api.rs

@@ -1,7 +1,13 @@
 use crate::{cache::Cache, core_api::CoreApi};
 
-pub trait CachedApi: CoreApi + Send + Sync {
-    fn get_mut_cache(&mut self) -> &mut dyn Cache<u64, bool>;
-    fn set_cache(&mut self, cache: Box<dyn Cache<u64, bool>>);
+use std::hash::Hash;
+
+pub trait CachedApi<K, V>: CoreApi + Send + Sync
+where
+    K: Eq + Hash,
+    V: Clone,
+{
+    fn get_mut_cache(&mut self) -> &mut dyn Cache<K, V>;
+    fn set_cache(&mut self, cache: Box<dyn Cache<K, V>>);
     fn set_capacity(&mut self, cap: usize);
 }

src/cached_enforcer.rs

@@ -321,7 +321,7 @@ impl CoreApi for CachedEnforcer {
     }
 }
 
-impl CachedApi for CachedEnforcer {
+impl CachedApi<u64, bool> for CachedEnforcer {
     fn get_mut_cache(&mut self) -> &mut dyn Cache<u64, bool> {
         &mut *self.cache
     }

src/emitter.rs

@@ -103,7 +103,10 @@ pub(crate) fn notify_logger_and_watcher<T: CoreApi>(e: &mut T, d: EventData) {
 
 #[cfg(feature = "cached")]
 #[allow(unused_variables)]
-pub(crate) fn clear_cache<T: CoreApi + CachedApi>(ce: &mut T, d: EventData) {
+pub(crate) fn clear_cache<T: CoreApi + CachedApi<u64, bool>>(
+    ce: &mut T,
+    d: EventData,
+) {
     #[cfg(feature = "logging")]
     {
         ce.get_logger().print_mgmt_log(&d);