aboutsummaryrefslogtreecommitdiff
path: root/src/framework/standard/mod.rs
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-10-10 21:09:17 -0700
committerZeyla Hellyer <[email protected]>2017-10-11 20:59:34 -0700
commit483b069cc0c821ec673ac475b168809e3a41525a (patch)
tree32fc42c8c0a5d65cd81b8044dd60e9e73a26f526 /src/framework/standard/mod.rs
parentAdd env_logger bot example (diff)
downloadserenity-483b069cc0c821ec673ac475b168809e3a41525a.tar.xz
serenity-483b069cc0c821ec673ac475b168809e3a41525a.zip
Fix clippy lints
Diffstat (limited to 'src/framework/standard/mod.rs')
-rw-r--r--src/framework/standard/mod.rs13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/framework/standard/mod.rs b/src/framework/standard/mod.rs
index 68bff80..38c1d2d 100644
--- a/src/framework/standard/mod.rs
+++ b/src/framework/standard/mod.rs
@@ -417,6 +417,7 @@ impl StandardFramework {
}
#[allow(too_many_arguments)]
+ #[cfg_attr(feature = "cargo-clippy", allow(cyclomatic_complexity))]
fn should_fail(&mut self,
mut context: &mut Context,
message: &Message,
@@ -511,12 +512,12 @@ impl StandardFramework {
if !command.allowed_roles.is_empty() {
if let Some(guild) = message.guild() {
let guild = guild.read().unwrap();
+
if let Some(member) = guild.members.get(&message.author.id) {
if let Ok(permissions) = member.permissions() {
- if !permissions.administrator() {
- if !has_correct_roles(&command, &guild, &member) {
- return Some(DispatchError::LackingRole);
- }
+ if !permissions.administrator()
+ && !has_correct_roles(command, &guild, member) {
+ return Some(DispatchError::LackingRole);
}
}
}
@@ -531,7 +532,7 @@ impl StandardFramework {
if all_passed {
None
} else {
- Some(DispatchError::CheckFailed(command.clone()))
+ Some(DispatchError::CheckFailed(Arc::clone(command)))
}
}
}
@@ -876,7 +877,7 @@ impl Framework for StandardFramework {
if let Some(&CommandOrAlias::Command(ref command)) =
group.commands.get(&to_check) {
let before = self.before.clone();
- let command = command.clone();
+ let command = Arc::clone(command);
let after = self.after.clone();
let groups = self.groups.clone();