Split event handling in the cache to a trait

note: This trait might become like `framework::Framework` in the future.

1 files changed, 4 insertions, 18 deletions

diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index aec821a..ad3660e 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -16,21 +16,15 @@ use Framework;
 
 #[cfg(feature = "cache")]
 use super::CACHE;
+#[cfg(feature = "cache")]
+use super::super::CacheEventsImpl;
 
 macro_rules! update {
     ($method:ident, @$event:expr) => {
         {
             #[cfg(feature="cache")]
             {
-                CACHE.write().unwrap().$method(&mut $event)
-            }
-        }
-    };
-    ($method:ident, @$event:expr, $old:expr) => {
-        {
-            #[cfg(feature="cache")]
-            {
-                CACHE.write().unwrap().$method(&mut $event, $old)
+                CacheEventsImpl::$method(&mut *CACHE.write().unwrap(), &mut $event)
             }
         }
     };
@@ -38,15 +32,7 @@ macro_rules! update {
         {
             #[cfg(feature="cache")]
             {
-                CACHE.write().unwrap().$method(&$event)
-            }
-        }
-    };
-    ($method:ident, $event:expr, $old:expr) => {
-        {
-            #[cfg(feature="cache")]
-            {
-                CACHE.write().unwrap().$method(&$event, $old)
+                CacheEventsImpl::$method(&mut *CACHE.write().unwrap(), &$event)
             }
         }
     };