technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2025-12-12 06:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: replace String with &str in function parameters (codeberg #9)

Browse source 
Reviewed-on: https://codeberg.org/iff/pay-respects/pulls/9
Co-authored-by: Integral <integral@member.fsf.org>
Co-committed-by: Integral <integral@member.fsf.org>
This commit is contained in:
Integral 2024-12-14 17:45:19 +00:00 • committed by iff
parent 9728ce48a6
commit aae2ce09f0
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
parser/src/lib.rs
View file

@ -24,9 +24,7 @@ mod replaces;
#[proc_macro] #[proc_macro]
pub fn parse_rules(input: TokenStream) -> TokenStream { pub fn parse_rules(input: TokenStream) -> TokenStream {
let directory = input.to_string().trim_matches('"').to_owned(); let rules = get_rules(input.to_string().trim_matches('"'));
let rules = get_rules(directory);
gen_match_rules(&rules) gen_match_rules(&rules)
} }
@ -42,7 +40,7 @@ struct MatchError {
suggest: Vec<String>, suggest: Vec<String>,
} }
fn get_rules(directory: String) -> Vec<Rule> { fn get_rules(directory: &str) -> Vec<Rule> {
let files = std::fs::read_dir(directory).expect("Failed to read directory."); let files = std::fs::read_dir(directory).expect("Failed to read directory.");
let mut rules = Vec::new(); let mut rules = Vec::new();

16
parser/src/replaces.rs
View file

@ -1,7 +1,7 @@
use proc_macro2::TokenStream as TokenStream2; use proc_macro2::TokenStream as TokenStream2;
use quote::quote; use quote::quote;
fn rtag(name: &str, x: i32, y: String) -> TokenStream2 { fn rtag(name: &str, x: i32, y: &str) -> TokenStream2 {
format!("{}{} = {}", name, x, y).parse().unwrap() format!("{}{} = {}", name, x, y).parse().unwrap()
} }
@ -43,7 +43,7 @@ pub fn opts(
}; };
opt_list.push(command); opt_list.push(command);
replace_list.push(rtag(tag_name, replace_tag, current_tag.to_owned())); replace_list.push(rtag(tag_name, replace_tag, &current_tag));
suggest.replace_range(placeholder, &current_tag); suggest.replace_range(placeholder, &current_tag);
replace_tag += 1; replace_tag += 1;
} }
@ -66,7 +66,7 @@ pub fn cmd_reg(suggest: &mut String, replace_list: &mut Vec<TokenStream2>) {
let command = format!("cmd_regex(r###\"{}\"###, &last_command)", regex); let command = format!("cmd_regex(r###\"{}\"###, &last_command)", regex);
replace_list.push(rtag(tag_name, replace_tag, command)); replace_list.push(rtag(tag_name, replace_tag, &command));
suggest.replace_range(placeholder, &tag(tag_name, replace_tag)); suggest.replace_range(placeholder, &tag(tag_name, replace_tag));
replace_tag += 1; replace_tag += 1;
} }
@ -83,7 +83,7 @@ pub fn err(suggest: &mut String, replace_list: &mut Vec<TokenStream2>) {
let command = format!("err_regex(r###\"{}\"###, error_msg)", regex); let command = format!("err_regex(r###\"{}\"###, error_msg)", regex);
replace_list.push(rtag(tag_name, replace_tag, command)); replace_list.push(rtag(tag_name, replace_tag, &command));
suggest.replace_range(placeholder, &tag(tag_name, replace_tag)); suggest.replace_range(placeholder, &tag(tag_name, replace_tag));
replace_tag += 1; replace_tag += 1;
} }
@ -117,7 +117,7 @@ pub fn command(suggest: &mut String, replace_list: &mut Vec<TokenStream2>) {
let command = format! {r#"split[{}..{}].join(" ")"#, start_string, end_string}; let command = format! {r#"split[{}..{}].join(" ")"#, start_string, end_string};
replace_list.push(rtag(tag_name, replace_tag, command)); replace_list.push(rtag(tag_name, replace_tag, &command));
suggest.replace_range(placeholder, &tag(tag_name, replace_tag)); suggest.replace_range(placeholder, &tag(tag_name, replace_tag));
} else { } else {
let range = range.parse::<i32>().unwrap_or(0); let range = range.parse::<i32>().unwrap_or(0);
@ -127,7 +127,7 @@ pub fn command(suggest: &mut String, replace_list: &mut Vec<TokenStream2>) {
format!("split[{}]", range) format!("split[{}]", range)
}; };
replace_list.push(rtag(tag_name, replace_tag, command)); replace_list.push(rtag(tag_name, replace_tag, &command));
suggest.replace_range(placeholder, &tag(tag_name, replace_tag)); suggest.replace_range(placeholder, &tag(tag_name, replace_tag));
} }
replace_tag += 1; replace_tag += 1;
@ -220,7 +220,7 @@ pub fn typo(suggest: &mut String, replace_list: &mut Vec<TokenStream2>) {
) )
}; };
replace_list.push(rtag(tag_name, replace_tag, command)); replace_list.push(rtag(tag_name, replace_tag, &command));
suggest.replace_range(placeholder, &tag(tag_name, replace_tag)); suggest.replace_range(placeholder, &tag(tag_name, replace_tag));
replace_tag += 1; replace_tag += 1;
} }
@ -251,7 +251,7 @@ pub fn shell_tag(suggest: &mut String, replace_list: &mut Vec<TokenStream2>, cmd
let argument = format!("\"{}\"", argument); let argument = format!("\"{}\"", argument);
let function = format!("{}, {}).join(\"\")", split.0, argument); let function = format!("{}, {}).join(\"\")", split.0, argument);
// let function = format!("\"{}, {}\"", split.0, split.1); // let function = format!("\"{}, {}\"", split.0, split.1);
replace_list.push(rtag(tag_name, replace_tag, function)); replace_list.push(rtag(tag_name, replace_tag, &function));
replace_tag += 1; replace_tag += 1;
} }
} }

2
utils/src/evals.rs
View file

@ -101,7 +101,7 @@ pub fn suggest_typo(typos: &[String], candidates: &[String], executables: &[Stri
unreachable!("suggest_typo: must have at least two candidates") unreachable!("suggest_typo: must have at least two candidates")
} }
} }
} else if let Some(suggest) = find_similar(typo, &candidates, Some(2)) { } else if let Some(suggest) = find_similar(typo, candidates, Some(2)) {
suggestions.push(suggest); suggestions.push(suggest);
} else { } else {
suggestions.push(typo.to_string()); suggestions.push(typo.to_string());