aboutsummaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorMei Boudreau <[email protected]>2017-11-23 10:34:30 -0500
committeralex <[email protected]>2017-11-23 16:34:30 +0100
commit2d23d8b50386e38fece6987286bd0b3d56d1cada (patch)
treec96a8f0c59d5c67fbe4241ca723fbbe03cacc04c /src/model
parentAdd `before`/`after` middleware to `Command` (diff)
downloadserenity-2d23d8b50386e38fece6987286bd0b3d56d1cada.tar.xz
serenity-2d23d8b50386e38fece6987286bd0b3d56d1cada.zip
Convert from macro to ? (#226)
Diffstat (limited to 'src/model')
-rw-r--r--src/model/guild/member.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs
index 74b0f69..5353fd4 100644
--- a/src/model/guild/member.rs
+++ b/src/model/guild/member.rs
@@ -159,7 +159,7 @@ impl Member {
#[cfg(all(feature = "cache", feature = "utils"))]
pub fn colour(&self) -> Option<Colour> {
let cache = CACHE.read();
- let guild = try_opt!(cache.guilds.get(&self.guild_id)).read();
+ let guild = cache.guilds.get(&self.guild_id)?.read();
let mut roles = self.roles
.iter()