Spring (fall?) cleaning

Author: technetos

src/commands.rs

@@ -37,7 +37,7 @@ impl Commands {
         info!("Adding command {}", &command);
         let mut state = 0;
 
-        let mut opt_lambda_state: Option<usize> = None;
+        let mut opt_lambda_state = None;
         let mut opt_final_states = vec![];
 
         command
@@ -47,14 +47,14 @@ impl Commands {
             .for_each(|(i, segment)| {
                 if let Some(name) = key_value_pair(segment) {
                     if let Some(lambda) = opt_lambda_state {
-                        state = add_key_value(&name, &mut self.state_machine, lambda);
+                        state = add_key_value(&mut self.state_machine, name, lambda);
                         self.state_machine.add_next_state(state, lambda);
                         opt_final_states.push(state);
                     } else {
                         opt_final_states.push(state);
                         state = add_space(&mut self.state_machine, state, i);
                         opt_lambda_state = Some(state);
-                        state = add_key_value(&name, &mut self.state_machine, state);
+                        state = add_key_value(&mut self.state_machine, name, state);
                         self.state_machine
                             .add_next_state(state, opt_lambda_state.unwrap());
                         opt_final_states.push(state);
@@ -66,21 +66,21 @@ impl Commands {
 
                     if segment.starts_with("```\n") && segment.ends_with("```") {
                         let name = &segment[4..segment.len() - 3];
-                        state = add_code_segment_multi_line(name, &mut self.state_machine, state);
+                        state = add_code_segment_multi_line(&mut self.state_machine, name, state);
                     } else if segment.starts_with("```") && segment.ends_with("```") {
                         let name = &segment[3..segment.len() - 3];
                         state =
-                            add_code_segment_single_line(name, &mut self.state_machine, state, 3);
+                            add_code_segment_single_line(&mut self.state_machine, name, state, 3);
                     } else if segment.starts_with("`") && segment.ends_with("`") {
                         let name = &segment[1..segment.len() - 1];
                         state =
-                            add_code_segment_single_line(name, &mut self.state_machine, state, 1);
+                            add_code_segment_single_line(&mut self.state_machine, name, state, 1);
                     } else if segment.starts_with("{") && segment.ends_with("}") {
                         let name = &segment[1..segment.len() - 1];
-                        state = add_dynamic_segment(name, &mut self.state_machine, state);
+                        state = add_dynamic_segment(&mut self.state_machine, name, state);
                     } else if segment.ends_with("...") {
                         let name = &segment[..segment.len() - 3];
-                        state = add_remaining_segment(name, &mut self.state_machine, state);
+                        state = add_remaining_segment(&mut self.state_machine, name, state);
                     } else {
                         segment.chars().for_each(|ch| {
                             state = self.state_machine.add(state, CharacterSet::from_char(ch))
@@ -157,8 +157,8 @@ fn add_space(state_machine: &mut StateMachine, mut state: usize, i: usize) -> us
 }
 
 fn add_dynamic_segment(
-    name: &'static str,
     state_machine: &mut StateMachine,
+    name: &'static str,
     mut state: usize,
 ) -> usize {
     let mut char_set = CharacterSet::any();
@@ -172,8 +172,8 @@ fn add_dynamic_segment(
 }
 
 fn add_remaining_segment(
-    name: &'static str,
     state_machine: &mut StateMachine,
+    name: &'static str,
     mut state: usize,
 ) -> usize {
     let char_set = CharacterSet::any();
@@ -186,8 +186,8 @@ fn add_remaining_segment(
 }
 
 fn add_code_segment_multi_line(
-    name: &'static str,
     state_machine: &mut StateMachine,
+    name: &'static str,
     mut state: usize,
 ) -> usize {
     state = state_machine.add(state, CharacterSet::from_char('`'));
@@ -220,8 +220,8 @@ fn add_code_segment_multi_line(
 }
 
 fn add_code_segment_single_line(
-    name: &'static str,
     state_machine: &mut StateMachine,
+    name: &'static str,
     mut state: usize,
     n_backticks: usize,
 ) -> usize {
@@ -239,7 +239,7 @@ fn add_code_segment_single_line(
     state
 }
 
-fn add_key_value(name: &'static str, state_machine: &mut StateMachine, mut state: usize) -> usize {
+fn add_key_value(state_machine: &mut StateMachine, name: &'static str, mut state: usize) -> usize {
     name.chars().for_each(|c| {
         state = state_machine.add(state, CharacterSet::from_char(c));
     });