Use conditional blocks over macros

4 files changed, 54 insertions, 34 deletions

diff --git a/src/client/context.rs b/src/client/context.rs
index dbb2ea2..8bbdfbe 100644
--- a/src/client/context.rs
+++ b/src/client/context.rs
@@ -1044,11 +1044,12 @@ impl Context {
         where C: Into<ChannelId> {
         let channel_id = channel_id.into();
 
-        feature_cache_enabled! {{
+        #[cfg(feature="cache")]
+        {
             if let Some(channel) = CACHE.read().unwrap().get_channel(channel_id) {
                 return Ok(channel.clone_inner());
             }
-        }}
+        }
 
         rest::get_channel(channel_id.0)
     }
@@ -1060,13 +1061,14 @@ impl Context {
         -> Result<HashMap<ChannelId, GuildChannel>> where G: Into<GuildId> {
         let guild_id = guild_id.into();
 
-        feature_cache_enabled! {{
+        #[cfg(feature="cache")]
+        {
             let cache = CACHE.read().unwrap();
 
             if let Some(guild) = cache.get_guild(guild_id) {
                 return Ok(guild.channels.clone());
             }
-        }}
+        }
 
         let mut channels = HashMap::new();
 
@@ -1193,13 +1195,14 @@ impl Context {
         let guild_id = guild_id.into();
         let user_id = user_id.into();
 
-        feature_cache_enabled! {{
+        #[cfg(feature="cache")]
+        {
             let cache = CACHE.read().unwrap();
 
             if let Some(member) = cache.get_member(guild_id, user_id) {
                 return Ok(member.clone());
             }
-        }}
+        }
 
         rest::get_member(guild_id.0, user_id.0)
     }
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index 5f61ea9..ac8376d 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -26,14 +26,20 @@ macro_rules! handler {
 
 macro_rules! update {
     ($method:ident, $event:expr) => {
-        feature_cache_enabled! {{
-            CACHE.write().unwrap().$method(&$event)
-        }}
+        {
+            #[cfg(feature="cache")]
+            {
+                CACHE.write().unwrap().$method(&$event)
+            }
+        }
     };
     ($method:ident, $event:expr, $old:expr) => {
-        feature_cache_enabled! {{
-            CACHE.write().unwrap().$method(&$event, $old)
-        }}
+        {
+            #[cfg(feature="cache")]
+            {
+                CACHE.write().unwrap().$method(&$event, $old)
+            }
+        }
     };
 }
 
@@ -169,9 +175,10 @@ fn handle_event(event: Event,
                     });
                 }}
             } else {
-                feature_cache_enabled! {{
+                #[cfg(feature="cache")]
+                {
                     update!(update_with_call_update, event, false);
-                }}
+                }
             }
         },
         Event::ChannelCreate(event) => {
@@ -355,9 +362,10 @@ fn handle_event(event: Event,
                     });
                 }}
             } else {
-                feature_cache_enabled! {{
+                #[cfg(feature="cache")]
+                {
                     let _full = update!(update_with_guild_delete, event);
-                }}
+                }
             }
         },
         Event::GuildEmojisUpdate(event) => {
@@ -411,9 +419,10 @@ fn handle_event(event: Event,
                     });
                 }}
             } else {
-                feature_cache_enabled! {{
+                #[cfg(feature="cache")]
+                {
                     let _member = update!(update_with_guild_member_remove, event);
-                }}
+                }
             }
         },
         Event::GuildMemberUpdate(event) => {
@@ -486,9 +495,10 @@ fn handle_event(event: Event,
                     });
                 }}
             } else {
-                feature_cache_enabled! {{
+                #[cfg(feature="cache")]
+                {
                     let _role = update!(update_with_guild_role_delete, event);
-                }}
+                }
             }
         },
         Event::GuildRoleUpdate(event) => {
@@ -508,9 +518,10 @@ fn handle_event(event: Event,
                     });
                 }}
             } else {
-                feature_cache_enabled! {{
+                #[cfg(feature="cache")]
+                {
                     let _before = update!(update_with_guild_role_update, event);
-                }}
+                }
             }
         },
         Event::GuildSync(event) => {
@@ -765,9 +776,10 @@ fn handle_event(event: Event,
                     });
                 }}
             } else {
-                feature_cache_enabled! {{
+                #[cfg(feature="cache")]
+                {
                     let _before = update!(update_with_user_guild_settings_update, event);
-                }}
+                }
             }
         },
         Event::UserNoteUpdate(event) => {
@@ -787,9 +799,10 @@ fn handle_event(event: Event,
                     });
                 }}
             } else {
-                feature_cache_enabled! {{
+                #[cfg(feature="cache")]
+                {
                     let _before = update!(update_with_user_note_update, event);
-                }}
+                }
             }
         },
         Event::UserSettingsUpdate(event) => {
@@ -810,9 +823,10 @@ fn handle_event(event: Event,
                     });
                 }}
             } else {
-                feature_cache_enabled! {{
+                #[cfg(feature="cache")]
+                {
                     update!(update_with_user_settings_update, event, false);
-                }}
+                }
             }
         },
         Event::UserUpdate(event) => {
@@ -832,9 +846,10 @@ fn handle_event(event: Event,
                     });
                 }}
             } else {
-                feature_cache_enabled! {{
+                #[cfg(feature="cache")]
+                {
                     let _before = update!(update_with_user_update, event);
-                }}
+                }
             }
         },
         Event::VoiceServerUpdate(event) => {
diff --git a/src/client/gateway/shard.rs b/src/client/gateway/shard.rs
index 0e4d46b..7c3b385 100644
--- a/src/client/gateway/shard.rs
+++ b/src/client/gateway/shard.rs
@@ -412,7 +412,8 @@ impl Shard {
             let _ = self.keepalive_channel.send(status);
         }
 
-        feature_voice_enabled! {{
+        #[cfg(feature="voice")]
+        {
             if let Event::VoiceStateUpdate(ref update) = *event {
                 if let Some(guild_id) = update.guild_id {
                     if let Some(handler) = self.manager.get(guild_id) {
@@ -428,7 +429,7 @@ impl Shard {
                     }
                 }
             }
-        }}
+        }
     }
 
     fn reconnect(&mut self, mut receiver: &mut Receiver<WebSocketStream>)
diff --git a/src/client/mod.rs b/src/client/mod.rs
index 075f323..bbc2bc1 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -810,11 +810,12 @@ impl Client {
                 Ok((shard, ready, receiver)) => {
                     self.shards.push(Arc::new(Mutex::new(shard)));
 
-                    feature_cache_enabled! {{
+                    #[cfg(feature="cache")]
+                    {
                         CACHE.write()
                             .unwrap()
                             .update_with_ready(&ready);
-                    }}
+                    }
 
                     match self.shards.last() {
                         Some(shard) => {