refactor: minor improvements (#5)

Author: markxoe

src/commands/derive_db.rs

@@ -87,7 +87,7 @@ fn derive_db_command(args: DeriveDbArgs) {
             .with_finish_message("Pages remapped"),
     );
 
-    let links = links::read_and_parse_links2(
+    let links = links::read_and_parse_links(
         pagelinks_sql.as_str(),
         threads,
         &lookup,

src/commands/interactive.rs

@@ -42,14 +42,14 @@ If you want to exit press ctrl+d or ctrl+c\n"
     let links = data.links;
     let lookup = data.pages;
 
-    fn page_input_loop<'a>(prompt: &str, pages: &'a PageMap) -> Option<PageMapResult> {
+    fn page_input_loop(prompt: &str, pages: &PageMap) -> Option<PageMapResult> {
         loop {
             let input = inquire::Text::new(prompt).prompt();
             if input.is_err() {
                 return None;
             }
 
-            let input = input.unwrap().replace(" ", "_");
+            let input = input.unwrap().replace(' ', "_");
             let page = pages.resolve_by_title(&input);
             if page.is_none() {
                 println!("Page not found");

src/data/maps/link_map.rs

@@ -29,13 +29,17 @@ impl LinkMap {
         };
 
         while let Some((from, to)) = links.pop_front() {
-            if map.contains_key(&from) {
-                map.get_mut(&from).unwrap().push(to);
-            } else {
-                map.insert(from, vec![to]);
+            match map.entry(from) {
+                std::collections::hash_map::Entry::Vacant(e) => {
+                    e.insert(vec![to]);
+                }
+                std::collections::hash_map::Entry::Occupied(mut e) => {
+                    e.get_mut().push(to);
+                }
             }
 
             links_counter += 1;
+
             if links_counter % shrink_every == 0 {
                 links.shrink_to_fit();
             }

src/data/parsers/common.rs

@@ -42,16 +42,13 @@ where
         let file_ptr = File::open(file).expect("Unable to open file");
         let reader = BufReader::new(file_ptr);
 
-        let mut i = 0;
-
-        for line in reader.lines().into_iter() {
+        for (i, line) in reader.lines().enumerate() {
             let line = line.unwrap();
             tx.send(line).expect("Error sending line");
 
             if i % 100 == 0 {
                 debug!("Read {} lines", i);
             }
-            i += 1;
         }
     });
 

src/data/parsers/links.rs

@@ -31,7 +31,7 @@ fn sync_parse_link_entry(
     out
 }
 
-pub fn read_and_parse_links2(
+pub fn read_and_parse_links(
     file: &str,
     threads: i32,
     resolver: &PageMap,
@@ -40,9 +40,7 @@ pub fn read_and_parse_links2(
     // note: namespace is fixed in regex to 0 (main namespace)
     let re = Regex::new(r"\(([0-9]+),0,'([^']+)',0,[0-9]*\)").expect("Invalid regex");
 
-    let progress = progress
-        .with_len(common::get_file_line_count(&file))
-        .build();
+    let progress = progress.with_len(common::get_file_line_count(file)).build();
 
     let out = common::parse_file_async(
         file.to_string(),

src/indication.rs

@@ -60,7 +60,7 @@ impl ProgressReporter {
         finish_message: Option<&'static str>,
         steps: Option<(u8, u8)>,
     ) -> Self {
-        let progress = spinner(if let Some(_) = steps { true } else { false });
+        let progress = spinner(steps.is_some());
         progress.set_message(message.clone());
 
         if let Some((step, steps)) = steps {
@@ -177,7 +177,7 @@ impl ProgressBuilder {
     }
 
     fn build_progress(self) -> ProgressReporter {
-        let len = self.len.unwrap() as u64;
+        let len = self.len.unwrap();
         let message = self.message.unwrap();
         let steps = self.steps.unwrap();
         let step = self.step.unwrap();
@@ -191,15 +191,9 @@ impl ProgressBuilder {
         let message = self.message.unwrap();
         let finish_message = self.finish_message;
 
-        let steps = if let Some(steps) = self.steps {
-            if let Some(step) = self.step {
-                Some((step, steps))
-            } else {
-                None
-            }
-        } else {
-            None
-        };
+        let steps = self
+            .steps
+            .map(|steps| (steps, self.step.expect("only steps given, no step")));
 
         ProgressReporter::new_spinner(message, finish_message, steps)
     }