diff options
| author | acdenisSK <[email protected]> | 2017-10-02 22:29:10 +0200 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-10-09 15:47:05 -0700 |
| commit | 2911f677431820ac858bae39ce53a3d6e202da1b (patch) | |
| tree | 1a65a208341e2a8006807f96074ca17cd0aaaed8 /src/model/user.rs | |
| parent | `to_owned` -> `to_string` (diff) | |
| download | serenity-2911f677431820ac858bae39ce53a3d6e202da1b.tar.xz serenity-2911f677431820ac858bae39ce53a3d6e202da1b.zip | |
Use the de-generification trick.
Fixes #168
Diffstat (limited to 'src/model/user.rs')
| -rw-r--r-- | src/model/user.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/model/user.rs b/src/model/user.rs index 3ae33aa..c3c3c0d 100644 --- a/src/model/user.rs +++ b/src/model/user.rs @@ -573,17 +573,19 @@ impl User { // no-cache would warn on guild_id. pub fn has_role<G, R>(&self, guild: G, role: R) -> bool where G: Into<GuildContainer>, R: Into<RoleId> { - let role_id = role.into(); + self._has_role(guild.into(), role.into()) + } - match guild.into() { - GuildContainer::Guild(guild) => guild.roles.contains_key(&role_id), + fn _has_role(&self, guild: GuildContainer, role: RoleId) -> bool { + match guild { + GuildContainer::Guild(guild) => guild.roles.contains_key(&role), GuildContainer::Id(_guild_id) => { feature_cache! {{ CACHE.read() .unwrap() .guilds .get(&_guild_id) - .map(|g| g.read().unwrap().roles.contains_key(&role_id)) + .map(|g| g.read().unwrap().roles.contains_key(&role)) .unwrap_or(false) } else { true |