summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorquentin konieczko <konieczko@gmail.com>2023-02-28 06:49:10 +0100
committerquentin konieczko <konieczko@gmail.com>2023-02-28 06:49:10 +0100
commit220d1bc95131f06c34c748ecbef0f460eae3d30b (patch)
treefa7564e4e71025e3a8e61fdd53e9f2baa63d91bc
parent614e072a7419f21c6e3ecdb7feca9f6975d9c99d (diff)
simplify preview & filematcher selection
-rw-r--r--src/skim.rs16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/skim.rs b/src/skim.rs
index ee97818..835812d 100644
--- a/src/skim.rs
+++ b/src/skim.rs
@@ -27,20 +27,16 @@ impl Skimer {
}
fn select_previewer<'a>() -> &'a str {
- let Some(bat) = BAT_EXECUTABLE.split_whitespace().into_iter().next() else { return CAT_EXECUTABLE; };
- if is_program_in_path(bat) {
- BAT_EXECUTABLE
- } else {
- CAT_EXECUTABLE
+ match BAT_EXECUTABLE.split_whitespace().into_iter().next() {
+ Some(bat) if is_program_in_path(bat) => BAT_EXECUTABLE,
+ _ => CAT_EXECUTABLE,
}
}
fn select_file_matcher<'a>() -> &'a str {
- let Some(rg) = RG_EXECUTABLE.split_whitespace().into_iter().next() else { return CAT_EXECUTABLE; };
- if is_program_in_path(rg) {
- RG_EXECUTABLE
- } else {
- GREP_EXECUTABLE
+ match RG_EXECUTABLE.split_whitespace().into_iter().next() {
+ Some(rg) if is_program_in_path(rg) => RG_EXECUTABLE,
+ _ => GREP_EXECUTABLE,
}
}