1 files changed, 7 insertions, 15 deletions

diff --git a/src/framework/standard/mod.rs b/src/framework/standard/mod.rs
index 1a7a5ee..36570af 100644
--- a/src/framework/standard/mod.rs
+++ b/src/framework/standard/mod.rs
@@ -425,7 +425,7 @@ impl StandardFramework {
 
     #[cfg(feature = "cache")]
     fn is_blocked_guild(&self, message: &Message) -> bool {
-        if let Some(Channel::Guild(channel)) = CACHE.read().unwrap().channel(message.channel_id) {
+        if let Some(Channel::Guild(channel)) = CACHE.read().channel(message.channel_id) {
             let guild_id = channel.with(|g| g.guild_id);
             if self.configuration.blocked_guilds.contains(&guild_id) {
                 return true;
@@ -536,7 +536,7 @@ impl StandardFramework {
             } else {
                 if !command.allowed_roles.is_empty() {
                     if let Some(guild) = message.guild() {
-                        let guild = guild.read().unwrap();
+                        let guild = guild.read();
 
                         if let Some(member) = guild.members.get(&message.author.id) {
                             if let Ok(permissions) = member.permissions() {
@@ -603,20 +603,18 @@ impl StandardFramework {
     /// });
     /// # }
     /// ```
-    pub fn on<F, S>(mut self, command_name: S, f: F) -> Self
-        where F: Fn(&mut Context, &Message, Args) -> Result<(), CommandError> + Send + Sync + 'static,
-              S: Into<String> {
+    pub fn on(mut self, name: &str,
+            f: fn(&mut Context, &Message, Args)
+            -> Result<(), CommandError>) -> Self {
         {
             let ungrouped = self.groups
                 .entry("Ungrouped".to_string())
                 .or_insert_with(|| Arc::new(CommandGroup::default()));
 
             if let Some(ref mut group) = Arc::get_mut(ungrouped) {
-                let name = command_name.into();
-
                 group
                     .commands
-                    .insert(name, CommandOrAlias::Command(Arc::new(Command::new(f))));
+                    .insert(name.to_string(), CommandOrAlias::Command(Arc::new(Command::new(f))));
             }
         }
 
@@ -910,13 +908,7 @@ impl Framework for StandardFramework {
                             let mut content = message.content[position..].trim();
                             content = content[command_length..].trim();
 
-                            let delimiter = self.configuration
-                                .delimiters
-                                .iter()
-                                .find(|&d| content.contains(d))
-                                .map_or(" ", |s| s.as_str());
-
-                            Args::new(content, delimiter)
+                            Args::new(&content, self.configuration.delimiters.clone())
                         };
 
                         if let Some(error) = self.should_fail(