diff options
| author | Zeyla Hellyer <[email protected]> | 2017-12-16 13:24:09 -0800 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-12-16 13:24:09 -0800 |
| commit | 9b53582f5e5e9650abda4106124e7f9f4e78a90c (patch) | |
| tree | 88bd56a75b1d110ea049abbaea88bb6e8a83dac3 /src/framework/standard/help_commands.rs | |
| parent | Fix compilation of examples (diff) | |
| download | serenity-9b53582f5e5e9650abda4106124e7f9f4e78a90c.tar.xz serenity-9b53582f5e5e9650abda4106124e7f9f4e78a90c.zip | |
Fix most clippy lints, take more refeernces
Fix clippy lints and subsequently accept references for more function
parameters.
Diffstat (limited to 'src/framework/standard/help_commands.rs')
| -rw-r--r-- | src/framework/standard/help_commands.rs | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/src/framework/standard/help_commands.rs b/src/framework/standard/help_commands.rs index 85debc4..c660209 100644 --- a/src/framework/standard/help_commands.rs +++ b/src/framework/standard/help_commands.rs @@ -28,6 +28,7 @@ use framework::standard::{has_correct_roles, has_correct_permissions}; use model::channel::Message; use model::id::ChannelId; use std::collections::HashMap; +use std::hash::BuildHasher; use std::sync::Arc; use std::fmt::Write; use super::command::{InternalCommand}; @@ -91,12 +92,13 @@ pub fn has_all_requirements(cmd: &Arc<CommandOptions>, msg: &Message) -> bool { /// client.with_framework(StandardFramework::new() /// .help(help_commands::with_embeds)); /// ``` -pub fn with_embeds(_: &mut Context, - msg: &Message, - help_options: &HelpOptions, - groups: HashMap<String, Arc<CommandGroup>>, - args: Args) - -> Result<(), CommandError> { +pub fn with_embeds<H: BuildHasher>( + _: &mut Context, + msg: &Message, + help_options: &HelpOptions, + groups: HashMap<String, Arc<CommandGroup>, H>, + args: &Args +) -> Result<(), CommandError> { if !args.is_empty() { let name = args.full(); @@ -151,7 +153,7 @@ pub fn with_embeds(_: &mut Context, let _ = msg.channel_id.send_message(|m| { m.embed(|e| { - let mut embed = e.colour(help_options.embed_success_colour.clone()).title(command_name.clone()); + let mut embed = e.colour(help_options.embed_success_colour).title(command_name.clone()); if let Some(ref desc) = command.desc { embed = embed.description(desc); @@ -197,7 +199,7 @@ pub fn with_embeds(_: &mut Context, } } - let error_msg = help_options.command_not_found_text.replace("{}", &name); + let error_msg = help_options.command_not_found_text.replace("{}", name); error_embed(&msg.channel_id, &error_msg, help_options.embed_error_colour); return Ok(()); @@ -304,12 +306,13 @@ pub fn with_embeds(_: &mut Context, /// client.with_framework(StandardFramework::new() /// .help(help_commands::plain)); /// ``` -pub fn plain(_: &mut Context, - msg: &Message, - help_options: &HelpOptions, - groups: HashMap<String, Arc<CommandGroup>>, - args: Args) - -> Result<(), CommandError> { +pub fn plain<H: BuildHasher>( + _: &mut Context, + msg: &Message, + help_options: &HelpOptions, + groups: HashMap<String, Arc<CommandGroup>, H>, + args: &Args +) -> Result<(), CommandError> { if !args.is_empty() { let name = args.full(); @@ -406,7 +409,7 @@ pub fn plain(_: &mut Context, } let _ = msg.channel_id - .say(&help_options.suggestion_text.replace("{}", &name)); + .say(&help_options.suggestion_text.replace("{}", name)); return Ok(()); } |