chore: clean

src/rules.rs

@@ -1,11 +1,8 @@
-use crate::suggestions::*;
 use crate::shell::Data;
+use crate::suggestions::*;
 use pay_respects_parser::parse_rules;
 
-pub fn match_pattern(
+pub fn match_pattern(executable: &str, data: &mut Data) {
-	executable: &str,
-	data: &mut Data
-) {
 	let error_msg = &data.error.clone();
 	let shell = &data.shell.clone();
 	let last_command = &data.command.clone();

src/runtime_rules.rs

@@ -1,6 +1,6 @@
 use crate::replaces;
-use crate::suggestions::*;
 use crate::shell::Data;
+use crate::suggestions::*;
 
 #[derive(serde::Deserialize)]
 struct Rule {
@@ -13,10 +13,7 @@ struct MatchError {
 	suggest: Vec<String>,
 }
 
-pub fn runtime_match(
+pub fn runtime_match(executable: &str, data: &mut Data) {
-	executable: &str,
-	data: &mut Data,
-) {
 	let file = get_rule(executable);
 	if file.is_none() {
 		return;
@@ -68,7 +65,7 @@ pub fn runtime_match(
 								shell,
 								last_command,
 								error_msg,
-								&split_command,
+								split_command,
 							) == reverse
 							{
 								continue 'suggest;
@@ -83,7 +80,12 @@ pub fn runtime_match(
 					if pure_suggest.contains("{{command}}") {
 						pure_suggest = pure_suggest.replace("{{command}}", last_command);
 					}
-					data.add_candidate(&eval_suggest(&pure_suggest, last_command, error_msg, shell));
+					data.add_candidate(&eval_suggest(
+						&pure_suggest,
+						last_command,
+						error_msg,
+						shell,
+					));
 				}
 			}
 		}

src/shell.rs

@@ -266,11 +266,7 @@ pub fn expand_alias(map: &HashMap<String, String>, command: &str) -> Option<Stri
 	} else {
 		(command, "")
 	};
-	if let Some(expand) = map.get(command) {
+	map.get(command).map(|expand| format!("{} {}", expand, args))
-		Some(format!("{} {}", expand, args))
-	} else {
-		None
-	}
 }
 
 pub fn expand_alias_multiline(map: &HashMap<String, String>, command: &str) -> Option<String> {

src/suggestions.rs

@@ -92,11 +92,15 @@ pub fn select_candidate(data: &mut Data) {
 			.with_answered_prompt_prefix(style)
 			.with_highlighted_option_prefix(style);
 
-		let msg = format!("{} suggestions found:", candidates.len()).bold().blue();
+		let msg = format!("{} suggestions found:", candidates.len())
-		let hint = format!("{} {} {}",
+			.bold()
+			.blue();
+		let hint = format!(
+			"{} {} {}",
 			"[↑/↓]".blue(),
 			t!("confirm-yes").green(),
-			"[Ctrl+C]".red());
+			"[Ctrl+C]".red()
+		);
 		eprintln!("{}", msg);
 		eprintln!("{}", hint);