diff options
| author | Mishio595 <[email protected]> | 2018-09-16 11:50:17 -0600 |
|---|---|---|
| committer | Mishio595 <[email protected]> | 2018-09-16 11:50:17 -0600 |
| commit | 260010c175ab17faccc970040802f07e5b079781 (patch) | |
| tree | 6be0bcdda08e919a6a286b93fe8bc367b3127bfe /src | |
| parent | Add back old message on update (diff) | |
| download | serenity-260010c175ab17faccc970040802f07e5b079781.tar.xz serenity-260010c175ab17faccc970040802f07e5b079781.zip | |
Finish rebase
Diffstat (limited to 'src')
| -rw-r--r-- | src/framework/standard/mod.rs | 9 | ||||
| -rw-r--r-- | src/model/channel/message.rs | 6 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/framework/standard/mod.rs b/src/framework/standard/mod.rs index 8c2fcd6..aa32d11 100644 --- a/src/framework/standard/mod.rs +++ b/src/framework/standard/mod.rs @@ -1053,7 +1053,7 @@ impl Framework for StandardFramework { // we want to make sure that all following matching prefixes are longer // than the last matching one, this prevents picking a wrong prefix, // e.g. "f" instead of "ferris" due to "f" having a lower index in the `Vec`. - let longest_matching_prefix_len = prefixes.iter().fold(0, |longest_prefix_len, prefix| + longest_matching_prefix_len = prefixes.iter().fold(0, |longest_prefix_len, prefix| if prefix.len() > longest_prefix_len && built.starts_with(prefix) && (orginal_round.len() == prefix.len() || built.get(prefix.len()..prefix.len() + 1) == Some(" ")) { @@ -1112,13 +1112,6 @@ impl Framework for StandardFramework { let command = Arc::clone(command); let mut args = command_and_help_args!(&message.content, position, command_length, &self.configuration.delimiters); - let mut args = { - let content = message.content.chars().skip(position).skip_while(|x| x.is_whitespace()) - .skip(command_length).collect::<String>(); - - Args::new(&content.trim(), &self.configuration.delimiters) - }; - if let Some(error) = self.should_fail( &mut context, &message, diff --git a/src/model/channel/message.rs b/src/model/channel/message.rs index dec3aa7..5589ad0 100644 --- a/src/model/channel/message.rs +++ b/src/model/channel/message.rs @@ -616,12 +616,6 @@ impl AsRef<MessageId> for Message { } } -impl AsRef<MessageId> for Message { - fn as_ref(&self) -> &MessageId { - &self.id - } -} - impl From<Message> for MessageId { /// Gets the Id of a `Message`. fn from(message: Message) -> MessageId { message.id } |