aboutsummaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorMei Boudreau <[email protected]>2017-10-12 18:18:31 -0400
committerZeyla Hellyer <[email protected]>2017-10-12 15:18:31 -0700
commit9b0c053725e04c60eb7ddcfeb847be4189b3dbf6 (patch)
tree6e1c2f5a38188f389bc14df7691a39549c9c2128 /src/model
parentOptimize Member::roles (diff)
downloadserenity-9b0c053725e04c60eb7ddcfeb847be4189b3dbf6.tar.xz
serenity-9b0c053725e04c60eb7ddcfeb847be4189b3dbf6.zip
Add try_opt macro for substitute
Diffstat (limited to 'src/model')
-rw-r--r--src/model/guild/member.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs
index 20b45b8..83cb863 100644
--- a/src/model/guild/member.rs
+++ b/src/model/guild/member.rs
@@ -159,10 +159,7 @@ impl Member {
#[cfg(all(feature = "cache", feature = "utils"))]
pub fn colour(&self) -> Option<Colour> {
let cache = CACHE.read().unwrap();
- let guild = match cache.guilds.get(&self.guild_id) {
- Some(guild) => guild.read().unwrap(),
- None => return None,
- };
+ let guild = try_opt!(cache.guilds.get(&self.guild_id)).read().unwrap();
let mut roles = self.roles
.iter()