Merge pull request #29 from rust-lang/better-args

Improve Args

Author: technetos

src/commands.rs

@@ -7,8 +7,8 @@ pub(crate) type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
 pub(crate) type CmdPtr = for<'m> fn(Args<'m>) -> Result<()>;
 
 pub struct Args<'m> {
-    pub cx: Context,
-    pub msg: Message,
+    pub cx: &'m Context,
+    pub msg: &'m Message,
     pub params: HashMap<&'m str, &'m str>,
 }
 
@@ -59,13 +59,13 @@ impl Commands {
     }
 
     pub(crate) fn execute<'m>(&'m self, cx: Context, msg: Message) {
-        if !msg.is_own(&cx) && msg.content.starts_with(PREFIX) {
-            let message = &msg.content.clone();
-            self.state_machine.process(&message).map(|matched| {
+        let message = &msg.content;
+        if !msg.is_own(&cx) && message.starts_with(PREFIX) {
+            self.state_machine.process(message).map(|matched| {
                 info!("Executing command {}", message);
                 let args = Args {
-                    cx,
-                    msg,
+                    cx: &cx,
+                    msg: &msg,
                     params: matched.params,
                 };
                 if let Err(e) = (matched.handler)(args) {
@@ -98,7 +98,7 @@ fn add_dynamic_segment(state_machine: &mut StateMachine, mut state: usize) -> us
 
 #[inline]
 fn add_remaining_segment(state_machine: &mut StateMachine, mut state: usize) -> usize {
-    let mut char_set = CharacterSet::any();
+    let char_set = CharacterSet::any();
     state = state_machine.add(state, char_set);
     state_machine.add_next_state(state, state);
     state_machine.start_parse(state);

src/main.rs

@@ -165,7 +165,7 @@ fn ban(args: Args) -> Result {
 
         if let Some(guild) = args.msg.guild(&args.cx) {
             info!("Banning user from guild");
-            guild.read().ban(&args.cx, UserId::from(user_id), &"all")?
+            guild.read().ban(args.cx, UserId::from(user_id), &"all")?
         }
     }
     Ok(())
@@ -223,7 +223,7 @@ fn welcome_message(args: Args) -> Result {
             })?;
 
         let white_check_mark = ReactionType::from("✅");
-        message.react(&args.cx, white_check_mark)?;
+        message.react(args.cx, white_check_mark)?;
     }
     Ok(())
 }

src/tags.rs

@@ -16,8 +16,8 @@ pub fn delete(args: Args) -> Result<()> {
         .ok_or("Unable to retrieve param: key")?;
 
     match diesel::delete(tags::table.filter(tags::key.eq(key))).execute(&conn) {
-        Ok(_) => args.msg.react(&args.cx, "✅")?,
-        Err(_) => args.msg.react(&args.cx, "❌")?,
+        Ok(_) => args.msg.react(args.cx, "✅")?,
+        Err(_) => args.msg.react(args.cx, "❌")?,
     }
     Ok(())
 }
@@ -40,8 +40,8 @@ pub fn post(args: Args) -> Result<()> {
         .values((tags::key.eq(key), tags::value.eq(value)))
         .execute(&conn)
     {
-        Ok(_) => args.msg.react(&args.cx, "✅")?,
-        Err(_) => args.msg.react(&args.cx, "❌")?,
+        Ok(_) => args.msg.react(args.cx, "✅")?,
+        Err(_) => args.msg.react(args.cx, "❌")?,
     }
 
     Ok(())