Merge pull request #462 from euank/tmp/pr-updates

cargo update a buncha stuff, update editions
euank · Feb 21, 2024 · 6bbfe29 · 6bbfe29
2 parents 15808e3 + e1c14a2
commit 6bbfe29
Show file tree

Hide file tree

Showing 12 changed files with 478 additions and 462 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/euank/pazi"
 readme = "README.md"
 keywords = ["autojump", "shell", "productivity-tool"]
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.clap]
 version = "~2"

diff --git a/bors.toml b/bors.toml
diff --git a/src/edit.rs b/src/edit.rs
@@ -36,7 +36,7 @@ pub fn edit(data: &[(String, f64)]) -> Result<PathFrecencyDiff> {
         .or_else(|_| {
             for bin in &["editor", "nano", "vim", "vi"] {
                 if let Ok(ed) = which::which(bin) {
-                        return Ok((ed, vec![]));
+                    return Ok((ed, vec![]));
                 }
             }
             Err(anyhow!("could not find editor in path"))

diff --git a/src/frecency.rs b/src/frecency.rs
@@ -100,10 +100,7 @@ where
                     }
                 };
             }
-            match min_entry {
-                None => None,
-                Some(e) => Some(e.0.clone()),
-            }
+            min_entry.map(|e| e.0.clone())
         };
 
         if let Some(min) = min_key {
@@ -130,11 +127,7 @@ where
     I: IntoIterator<Item = (&'a T, &'a f64)>,
 {
     pub fn normalized(self) -> Vec<(&'a T, f64)> {
-        let mut items: Vec<_> = self
-            .items
-            .into_iter()
-            .map(|(k, v)| (k, *v))
-            .collect();
+        let mut items: Vec<_> = self.items.into_iter().map(|(k, v)| (k, *v)).collect();
         if items.is_empty() {
             return Vec::new();
         }
@@ -155,10 +148,7 @@ where
     }
 
     pub fn raw(self) -> Vec<(&'a T, f64)> {
-        self.items
-            .into_iter()
-            .map(|(k, v)| (k, *v))
-            .collect()
+        self.items.into_iter().map(|(k, v)| (k, *v)).collect()
     }
 }
 

diff --git a/src/frecent_paths.rs b/src/frecent_paths.rs
@@ -245,8 +245,8 @@ impl PathFrecency {
         };
         let matched = items.iter().flat_map(|item| {
             matchers.iter().filter_map(move |m| {
-                m.matches(&item.0, filter)
-                    .map(move |v| weight(&item.0, item.1, v))
+                m.matches(item.0, filter)
+                    .map(move |v| weight(item.0, item.1, v))
             })
         });
 

diff --git a/src/importers/mod.rs b/src/importers/mod.rs
@@ -6,7 +6,7 @@ use std::io::BufRead;
 use std::io::BufReader;
 use std::path::{Path, PathBuf};
 
-use log::{warn, debug};
+use log::{debug, warn};
 
 pub struct Fasd;
 
@@ -22,8 +22,7 @@ impl Fasd {
             // For proper compatibility, this should use 'shellexpand' or a similar crate.
             Ok(dir) => PathBuf::from(dir),
             Err(_) => {
-                let user_dirs =
-                    directories::UserDirs::new().ok_or("could not get home dir")?;
+                let user_dirs = directories::UserDirs::new().ok_or("could not get home dir")?;
                 let home = user_dirs.home_dir();
                 home.join(".fasd")
             }
@@ -39,7 +38,7 @@ impl Fasd {
 
         for line in BufReader::new(f).lines() {
             let line = line.map_err(|e| format!("error reading {:?}: {}", &fasd_data, e))?;
-            let data = match line.splitn(2, '|').next() {
+            let data = match line.split('|').next() {
                 None => {
                     warn!("Incorrectly formatted fasd data line: {}", line);
                     continue;

diff --git a/src/main.rs b/src/main.rs
@@ -292,7 +292,7 @@ fn _main() -> PaziResult {
         } else {
             res = PaziResult::Error;
         }
-    } else if flags.value_of("dir_target") != None {
+    } else if flags.value_of("dir_target").is_some() {
         // Something got interpreted as 'dir_target' even though this wasn't in '--dir'
         println!("pazi: could not parse given flags.\n\n{}", flags.usage());
         return PaziResult::Error;
@@ -386,17 +386,12 @@ fn handle_edit(cmd: &ArgMatches) -> PaziResult {
             return PaziResult::Error;
         }
     };
-    match frecency.apply_diff(diff) {
-        Err(e) => {
-            println!("Error applying edit diff: {:?}", e);
-            return PaziResult::Error;
-        }
-        Ok(()) => {}
+    if let Err(e) = frecency.apply_diff(diff) {
+        println!("Error applying edit diff: {:?}", e);
+        return PaziResult::Error;
     };
     match frecency.save_to_disk() {
-        Ok(_) => {
-            PaziResult::Success
-        }
+        Ok(_) => PaziResult::Success,
         Err(e) => {
             println!("pazi: error saving db: {:?}", e);
             PaziResult::Error
@@ -473,7 +468,6 @@ fn handle_jump(cmd: &ArgMatches) -> PaziResult {
             return PaziResult::Error;
         }
     };
-    let res;
 
     let mut matches = match cmd.value_of("dir_target") {
         Some(to) => {
@@ -487,7 +481,7 @@ fn handle_jump(cmd: &ArgMatches) -> PaziResult {
         None => frecency.items_with_frecency(),
     };
 
-    res = if cmd.is_present("interactive") {
+    let res = if cmd.is_present("interactive") {
         let stdout = termion::get_tty().unwrap();
         match interactive::filter(matches, std::io::stdin(), stdout) {
             Ok(el) => {
@@ -551,9 +545,7 @@ fn handle_visit(cmd: &ArgMatches) -> PaziResult {
     frecency.visit(dir.to_string());
 
     match frecency.save_to_disk() {
-        Ok(_) => {
-            PaziResult::Success
-        }
+        Ok(_) => PaziResult::Success,
         Err(e) => {
             println!("pazi: error adding directory: {:?}", e);
             PaziResult::Error
@@ -597,7 +589,7 @@ fn frecency_path() -> Result<PathBuf, String> {
         .ok_or_else(|| "unable to determine config path".to_string())?;
     let config_dir = project_dir.config_dir();
 
-    std::fs::create_dir_all(&config_dir)
+    std::fs::create_dir_all(config_dir)
         .map_err(|e| format!("could not create config dir: {}", e))?;
 
     let db_path = config_dir.join(PAZI_DB_NAME);

diff --git a/src/matcher.rs b/src/matcher.rs
@@ -102,13 +102,12 @@ impl<'a> CaseInsensitiveMatcher<'a> {
 
 impl<'a> Matcher for TransformedMatcher<'a> {
     fn matches(&self, input: &str, search: &str) -> Option<f64> {
-        match self.matcher.matches(
-            &(self.input_transformation)(input),
-            &(self.search_transformation)(search),
-        ) {
-            Some(f) => Some(f * self.attenuation),
-            None => None,
-        }
+        self.matcher
+            .matches(
+                &(self.input_transformation)(input),
+                &(self.search_transformation)(search),
+            )
+            .map(|f| f * self.attenuation)
     }
 }