diff options
| author | Zeyla Hellyer <[email protected]> | 2017-06-06 10:39:15 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-06-06 10:39:15 -0700 |
| commit | 21d989cfe0b67882ab6f36d42a95e1736d9c0bf5 (patch) | |
| tree | 28dd8bab62d421ded1b5d959f7348abf0f8b5753 /src/framework | |
| parent | Make User::direct_message/dm accept a builder (diff) | |
| download | serenity-21d989cfe0b67882ab6f36d42a95e1736d9c0bf5.tar.xz serenity-21d989cfe0b67882ab6f36d42a95e1736d9c0bf5.zip | |
Clippy lints
Diffstat (limited to 'src/framework')
| -rw-r--r-- | src/framework/help_commands.rs | 10 | ||||
| -rw-r--r-- | src/framework/mod.rs | 30 |
2 files changed, 23 insertions, 17 deletions
diff --git a/src/framework/help_commands.rs b/src/framework/help_commands.rs index 3396f3c..a4dbe76 100644 --- a/src/framework/help_commands.rs +++ b/src/framework/help_commands.rs @@ -179,7 +179,7 @@ pub fn with_embeds(ctx: &mut Context, for name in command_names { let cmd = &commands[name]; - + if cmd.help_available { let _ = write!(desc, "`{}`\n", name); @@ -188,7 +188,7 @@ pub fn with_embeds(ctx: &mut Context, } if has_commands { - e = e.field(|f| f.name(&group_name).value(&desc)); + e = e.field(|f| f.name(group_name).value(&desc)); } } @@ -301,16 +301,16 @@ pub fn plain(ctx: &mut Context, let commands = remove_aliases(&group.commands); let mut command_names = commands.keys().collect::<Vec<_>>(); command_names.sort(); - + for name in command_names { let cmd = &commands[name]; - + if cmd.help_available { let _ = write!(group_help, "`{}` ", name); } } - if group_help.len() > 0 { + if !group_help.is_empty() { let _ = write!(result, "**{}:** ", group_name); if let Some(ref x) = group.prefix { diff --git a/src/framework/mod.rs b/src/framework/mod.rs index 38615c8..20da188 100644 --- a/src/framework/mod.rs +++ b/src/framework/mod.rs @@ -590,15 +590,16 @@ impl Framework { /// /// ```rust /// # #[macro_use] extern crate serenity; - /// command!(ping(_ctx, msg) { - /// msg.channel_id.say("pong!"); - /// }); /// # /// # fn main() { - /// # use serenity::Client; - /// # let mut client = Client::login("token"); + /// # use serenity::Client; + /// # let mut client = Client::login("token"); /// # /// client.with_framework(|f| f.on("ping", ping)); + /// + /// command!(ping(_ctx, msg) { + /// let _ = msg.channel_id.say("pong!"); + /// }); /// # } /// ``` pub fn on<F, S>(mut self, command_name: S, f: F) -> Self @@ -702,15 +703,19 @@ impl Framework { /// use serenity::framework::DispatchError::{NotEnoughArguments, TooManyArguments}; /// /// client.with_framework(|f| f - /// .on_dispatch_error(|ctx, msg, error| { + /// .on_dispatch_error(|_, msg, error| { /// match error { /// NotEnoughArguments { min, given } => { - /// msg.channel_id.say(&format!("Need {} arguments, but only got {}.", min, given)); - /// } + /// let s = format!("Need {} arguments, but only got {}.", min, given); + /// + /// let _ = msg.channel_id.say(&s); + /// }, /// TooManyArguments { max, given } => { - /// msg.channel_id.say(&format!("Max arguments allowed is {}, but got {}.", max, given)); - /// } - /// _ => println!("Unhandled dispatch error.") + /// let s = format!("Max arguments allowed is {}, but got {}.", max, given); + /// + /// let _ = msg.channel_id.say(&s); + /// }, + /// _ => println!("Unhandled dispatch error."), /// } /// })); /// ``` @@ -746,7 +751,7 @@ impl Framework { /// # let mut client = Client::login("token"); /// # /// client.with_framework(|f| f - /// .before(|ctx, msg, cmd_name| { + /// .before(|_, msg, cmd_name| { /// if let Ok(channel) = msg.channel_id.get() { /// // Don't run unless in nsfw channel /// if !channel.is_nsfw() { @@ -755,6 +760,7 @@ impl Framework { /// } /// /// println!("Running command {}", cmd_name); + /// /// true /// })); /// ``` |