diff options
| author | Austin Hellyer <[email protected]> | 2016-12-29 11:49:28 -0800 |
|---|---|---|
| committer | Austin Hellyer <[email protected]> | 2016-12-29 11:49:28 -0800 |
| commit | fa4952b30fec8f62c9882c2c9ef9836eae2cd9a9 (patch) | |
| tree | cae13f61f6634183ff73c24703c66d57b6b1d8e8 /src/client/context.rs | |
| parent | Add user static avatar url methods (diff) | |
| download | serenity-fa4952b30fec8f62c9882c2c9ef9836eae2cd9a9.tar.xz serenity-fa4952b30fec8f62c9882c2c9ef9836eae2cd9a9.zip | |
Use conditional blocks over macros
Diffstat (limited to 'src/client/context.rs')
| -rw-r--r-- | src/client/context.rs | 15 |
1 files changed, 9 insertions, 6 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) } |