diff --git a/core/Cargo.toml b/core/Cargo.toml index 1fc0fdc..051c88c 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -21,8 +21,6 @@ regex-lite = "0.1" inquire = "0.7.5" -# pay-respects-parser = "0.3.3" -# pay-respects-utils = "0.1.2" pay-respects-parser = { version = "0.3.4", path = "../parser" } pay-respects-utils = { version ="0.1.3", path = "../utils"} diff --git a/core/src/suggestions.rs b/core/src/suggestions.rs index 7dec230..5eb42eb 100644 --- a/core/src/suggestions.rs +++ b/core/src/suggestions.rs @@ -33,7 +33,7 @@ pub fn suggest_candidates(data: &mut Data) { thread::scope(|s| { s.spawn(|| { for module in modules { - let new_candidates = module_output(&data, module); + let new_candidates = module_output(data, module); if let Some(candidates) = new_candidates { add_candidates_no_dup(command, &mut module_candidates, &candidates); diff --git a/module-runtime-rules/src/replaces.rs b/module-runtime-rules/src/replaces.rs index 469bd22..927514d 100644 --- a/module-runtime-rules/src/replaces.rs +++ b/module-runtime-rules/src/replaces.rs @@ -207,10 +207,10 @@ pub fn exes( let matches = { let res = best_matches_path(&split_command[index], executables); - if res.is_none() { - vec![split_command[index].clone()] + if let Some(res) = res { + res } else { - res.unwrap() + vec![split_command[index].clone()] } }; for match_ in matches { @@ -219,7 +219,7 @@ pub fn exes( let tag = "{{exes}}"; let placeholder = suggest[placeholder.clone()].to_owned(); - *suggest = suggest.replace(&placeholder, &tag); + *suggest = suggest.replace(&placeholder, tag); } } diff --git a/parser/src/replaces.rs b/parser/src/replaces.rs index 3245c03..237ee23 100644 --- a/parser/src/replaces.rs +++ b/parser/src/replaces.rs @@ -268,7 +268,7 @@ pub fn exes(suggest: &mut String, exes_list: &mut Vec) { let tag = "{{{{exes}}}}"; let placeholder = suggest[placeholder.clone()].to_owned(); - *suggest = suggest.replace(&placeholder, &tag); + *suggest = suggest.replace(&placeholder, tag); } }