diff options
| author | acdenisSK <[email protected]> | 2017-08-19 02:05:11 +0200 |
|---|---|---|
| committer | acdenisSK <[email protected]> | 2017-08-19 02:05:39 +0200 |
| commit | 3e97e77ce8878c65cf3051c053d32af8e4888957 (patch) | |
| tree | 5c0d90317ec87b1e4740b78e41a78ba9e3f2b924 /src/model/guild | |
| parent | Fix a failing test (#140) (diff) | |
| download | serenity-3e97e77ce8878c65cf3051c053d32af8e4888957.tar.xz serenity-3e97e77ce8878c65cf3051c053d32af8e4888957.zip | |
Clippy
Diffstat (limited to 'src/model/guild')
| -rw-r--r-- | src/model/guild/audit_log.rs | 2 | ||||
| -rw-r--r-- | src/model/guild/mod.rs | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/model/guild/audit_log.rs b/src/model/guild/audit_log.rs index 34d45a8..916530e 100644 --- a/src/model/guild/audit_log.rs +++ b/src/model/guild/audit_log.rs @@ -160,7 +160,7 @@ fn deserialize_action<'de, D: Deserializer<'de>>(de: D) -> Result<Action, D::Err fn visit_i32<E: de::Error>(self, value: i32) -> Result<Action, E> { Ok(match value { 1 => Action::GuildUpdate, - 10...13 => Action::Channel(unsafe { transmute(value) }), + 10...12 => Action::Channel(unsafe { transmute(value) }), 13...15 => Action::ChannelOverwrite(unsafe { transmute(value) }), 20...25 => Action::Member(unsafe { transmute(value) }), 30...32 => Action::Role(unsafe { transmute(value) }), diff --git a/src/model/guild/mod.rs b/src/model/guild/mod.rs index 9e6d6ee..e5e997c 100644 --- a/src/model/guild/mod.rs +++ b/src/model/guild/mod.rs @@ -130,10 +130,7 @@ impl Guild { let uid = CACHE.read().unwrap().user.id; for (cid, channel) in &self.channels { - if { - let perms = self.permissions_for(*cid, uid); - perms.read_messages() - } { + if self.permissions_for(*cid, uid).read_messages() { return Some(channel.read().unwrap().clone()); } } @@ -147,12 +144,9 @@ impl Guild { pub fn default_channel_guaranteed(&self) -> Option<GuildChannel> { for (cid, channel) in &self.channels { for memid in self.members.keys() { - if { - let perms = self.permissions_for(*cid, *memid); - perms.read_messages() - } { - return Some(channel.read().unwrap().clone()); - } + if self.permissions_for(*cid, *memid).read_messages() { + return Some(channel.read().unwrap().clone()); + } } } |