From 7c7cc4d285582527991dbc5249f7341661f60944 Mon Sep 17 00:00:00 2001 From: Integral Date: Sat, 14 Dec 2024 16:53:03 +0000 Subject: [PATCH] refactor: replace Vec with &[T] in function parameters (codeberg #7) Reviewed-on: https://codeberg.org/iff/pay-respects/pulls/7 Co-authored-by: Integral Co-committed-by: Integral --- core/src/shell.rs | 2 +- module-runtime-rules/src/rules.rs | 6 +++--- parser/src/lib.rs | 2 +- parser/src/replaces.rs | 6 +----- utils/src/evals.rs | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/core/src/shell.rs b/core/src/shell.rs index 767c2af..254de43 100644 --- a/core/src/shell.rs +++ b/core/src/shell.rs @@ -232,7 +232,7 @@ pub fn elevate(data: &mut Data, command: &mut String) { pub fn add_candidates_no_dup( command: &str, candidates: &mut Vec, - new_candidates: &Vec, + new_candidates: &[String], ) { for candidate in new_candidates { let candidate = candidate.trim(); diff --git a/module-runtime-rules/src/rules.rs b/module-runtime-rules/src/rules.rs index 4af0f7a..cdd9d0b 100644 --- a/module-runtime-rules/src/rules.rs +++ b/module-runtime-rules/src/rules.rs @@ -161,7 +161,7 @@ fn get_rule(executable: &str) -> Option { return Some(user_rule_file); } - let check_dirs = |dirs: Vec<&str>| -> Option { + let check_dirs = |dirs: &[&str]| -> Option { for dir in dirs { let rule_dir = format!("{}/pay-respects/rules", dir); let rule_file = format!("{}/{}.toml", rule_dir, executable); @@ -175,7 +175,7 @@ fn get_rule(executable: &str) -> Option { let xdg_config_dirs = std::env::var("XDG_CONFIG_DIRS").unwrap_or("/etc/xdg".to_owned()); let xdg_config_dirs = xdg_config_dirs.split(':').collect::>(); - if let Some(file) = check_dirs(xdg_config_dirs) { + if let Some(file) = check_dirs(&xdg_config_dirs) { return Some(file); } @@ -183,7 +183,7 @@ fn get_rule(executable: &str) -> Option { std::env::var("XDG_DATA_DIRS").unwrap_or("/usr/local/share:/usr/share".to_owned()); let xdg_data_dirs = xdg_data_dirs.split(':').collect::>(); - if let Some(file) = check_dirs(xdg_data_dirs) { + if let Some(file) = check_dirs(&xdg_data_dirs) { return Some(file); } diff --git a/parser/src/lib.rs b/parser/src/lib.rs index 6325918..0675d19 100644 --- a/parser/src/lib.rs +++ b/parser/src/lib.rs @@ -57,7 +57,7 @@ fn get_rules(directory: String) -> Vec { rules } -fn gen_match_rules(rules: Vec) -> TokenStream { +fn gen_match_rules(rules: &[Rule]) -> TokenStream { let command = rules .iter() .map(|x| x.command.to_owned()) diff --git a/parser/src/replaces.rs b/parser/src/replaces.rs index 026c186..b9ac8c6 100644 --- a/parser/src/replaces.rs +++ b/parser/src/replaces.rs @@ -238,11 +238,7 @@ pub fn shell(suggest: &mut String, cmd_list: &mut Vec) { } } -pub fn shell_tag( - suggest: &mut String, - replace_list: &mut Vec, - cmd_list: Vec, -) { +pub fn shell_tag(suggest: &mut String, replace_list: &mut Vec, cmd_list: &[String]) { let mut replace_tag = 0; let tag_name = "shell"; diff --git a/utils/src/evals.rs b/utils/src/evals.rs index c2ade66..c447e8e 100644 --- a/utils/src/evals.rs +++ b/utils/src/evals.rs @@ -69,7 +69,7 @@ pub fn split_command(command: &str) -> Vec { split_command } -pub fn suggest_typo(typos: &[String], candidates: Vec, executables: &[String]) -> String { +pub fn suggest_typo(typos: &[String], candidates: &[String], executables: &[String]) -> String { let mut suggestions = Vec::new(); for typo in typos { let typo = typo.as_str();