diff options
| author | Zeyla Hellyer <[email protected]> | 2017-10-10 21:09:17 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-10-11 20:59:34 -0700 |
| commit | 483b069cc0c821ec673ac475b168809e3a41525a (patch) | |
| tree | 32fc42c8c0a5d65cd81b8044dd60e9e73a26f526 /src/framework/standard/help_commands.rs | |
| parent | Add env_logger bot example (diff) | |
| download | serenity-483b069cc0c821ec673ac475b168809e3a41525a.tar.xz serenity-483b069cc0c821ec673ac475b168809e3a41525a.zip | |
Fix clippy lints
Diffstat (limited to 'src/framework/standard/help_commands.rs')
| -rw-r--r-- | src/framework/standard/help_commands.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/framework/standard/help_commands.rs b/src/framework/standard/help_commands.rs index 91e173b..631ec3b 100644 --- a/src/framework/standard/help_commands.rs +++ b/src/framework/standard/help_commands.rs @@ -51,7 +51,7 @@ fn remove_aliases(cmds: &HashMap<String, CommandOrAlias>) -> HashMap<&String, &I result } -/// Checks whether a user is member of required roles +/// Checks whether a user is member of required roles /// and given the required permissions. pub fn has_all_requirements(cmd: &Command, guild: &Guild, member: &Member, msg: &Message) -> bool { if cmd.allowed_roles.is_empty() { @@ -106,7 +106,7 @@ pub fn with_embeds(_: &mut Context, if let Some(member) = guild.members.get(&msg.author.id) { if let Ok(permissions) = member.permissions() { if !permissions.administrator() && - !has_all_requirements(cmd, &guild, member, &msg) { + !has_all_requirements(cmd, &guild, member, msg) { break; } } @@ -213,7 +213,7 @@ pub fn with_embeds(_: &mut Context, if let Some(member) = guild.members.get(&msg.author.id) { if let Ok(permissions) = member.permissions() { if cmd.help_available && - (has_all_requirements(cmd, &guild, member, &msg) || + (has_all_requirements(cmd, &guild, member, msg) || permissions.administrator()) { let _ = write!(desc, "`{}`\n", name); has_commands = true; @@ -252,6 +252,7 @@ pub fn with_embeds(_: &mut Context, /// client.with_framework(StandardFramework::new() /// .command("help", |c| c.exec_help(help_commands::plain))); /// ``` +#[cfg_attr(feature = "cargo-clippy", allow(cyclomatic_complexity))] pub fn plain(_: &mut Context, msg: &Message, groups: HashMap<String, Arc<CommandGroup>>, @@ -279,7 +280,7 @@ pub fn plain(_: &mut Context, if let Some(member) = guild.members.get(&msg.author.id) { if let Ok(permissions) = member.permissions() { if !permissions.administrator() && - !has_all_requirements(cmd, &guild, member, &msg) { + !has_all_requirements(cmd, &guild, member, msg) { break; } } @@ -366,7 +367,7 @@ pub fn plain(_: &mut Context, if let Some(member) = guild.members.get(&msg.author.id) { if let Ok(permissions) = member.permissions() { if cmd.help_available && - (permissions.administrator() || has_all_requirements(cmd, &guild, member, &msg)) { + (permissions.administrator() || has_all_requirements(cmd, &guild, member, msg)) { let _ = write!(group_help, "`{}` ", name); } } |