aboutsummaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorAustin Hellyer <[email protected]>2016-11-21 19:28:26 -0800
committerAustin Hellyer <[email protected]>2016-11-21 19:28:26 -0800
commit59f546d8d84d8dad76c1f159f1cd7ef4ccea00fb (patch)
tree9e89a122328f14e298c50681e432a3bf3d5d50e9 /src/model
parentRe-organize the client module (diff)
downloadserenity-59f546d8d84d8dad76c1f159f1cd7ef4ccea00fb.tar.xz
serenity-59f546d8d84d8dad76c1f159f1cd7ef4ccea00fb.zip
Don't unnecessarily borrow some if-lets
Diffstat (limited to 'src/model')
-rw-r--r--src/model/mod.rs1
-rw-r--r--src/model/user.rs4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/model/mod.rs b/src/model/mod.rs
index 20dfabb..26041a9 100644
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@@ -58,6 +58,7 @@ macro_rules! id {
$(
#[$attr]
#[derive(Copy, Clone, Debug, Eq, Hash, PartialOrd, Ord)]
+ #[allow(derive_hash_xor_eq)]
pub struct $name(pub u64);
impl $name {
diff --git a/src/model/user.rs b/src/model/user.rs
index 68c46ec..412d1ae 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -127,9 +127,9 @@ impl User {
feature_state! {{
let state = STATE.lock().unwrap();
- return state.get_role(guild_id, role_id).is_some();
+ state.get_role(guild_id, role_id).is_some()
} else {
- return true;
+ true
}}
},
}