Unnecessarily Cloning, structuring

src/align.rs

@@ -167,10 +167,9 @@ where
             encoded.push((*curr, j - i));
             if j == end {
                 return encoded;
-            } else {
-                curr = &sequence[j];
-                i = j;
             }
+            curr = &sequence[j];
+            i = j;
         }
         j += 1;
     }

src/features/line_numbers.rs

@@ -189,7 +189,7 @@ impl<'a> LineNumbersData<'a> {
         // file. In the case of merge commits, it may be longer.
         self.line_number =
             MinusPlus::new(line_numbers[0].0, line_numbers[line_numbers.len() - 1].0);
-        let hunk_max_line_number = line_numbers.iter().map(|(n, d)| n + d).max().unwrap();
+        let hunk_max_line_number = line_numbers.iter().map(|(n, d)| n + d).max().unwrap_or_default();
         self.hunk_max_line_number_width =
             1 + (hunk_max_line_number as f64).log10().floor() as usize;
         self.plus_file = plus_file;

src/git_config/mod.rs

@@ -156,21 +156,15 @@ fn parse_config_from_env_var_value(s: &str) -> HashMap<String, String> {
     GIT_CONFIG_PARAMETERS_REGEX
         .captures_iter(s)
         .map(|captures| {
-            let (i, j) = match (
-                captures.get(1),
-                captures.get(2),
-                captures.get(3),
-                captures.get(4),
-            ) {
-                (Some(_), Some(_), None, None) => (1, 2),
-                (None, None, Some(_), Some(_)) => (3, 4),
-                _ => (0, 0),
-            };
-            if (i, j) == (0, 0) {
-                ("".to_string(), "".to_string())
-            } else {
-                (captures[i].to_string(), captures[j].to_string())
-            }
+            let key = captures
+                .get(1)
+                .or_else(|| captures.get(3))
+                .map_or("".to_string(), |m| m.as_str().to_string());
+            let value = captures
+                .get(2)
+                .or_else(|| captures.get(4))
+                .map_or("".to_string(), |m| m.as_str().to_string());
+            (key, value)
         })
         .collect()
 }

src/handlers/blame.rs

@@ -233,15 +233,15 @@ $
 pub fn parse_git_blame_line<'a>(line: &'a str, timestamp_format: &str) -> Option<BlameLine<'a>> {
     let caps = BLAME_LINE_REGEX.captures(line)?;
 
-    let commit = caps.get(1).unwrap().as_str();
-    let author = caps.get(2).unwrap().as_str();
-    let timestamp = caps.get(3).unwrap().as_str();
+    let commit = caps.get(1)?.as_str();
+    let author = caps.get(2)?.as_str();
+    let timestamp = caps.get(3)?.as_str();
 
     let time = DateTime::parse_from_str(timestamp, timestamp_format).ok()?;
 
-    let line_number = caps.get(4).unwrap().as_str().parse::<usize>().ok()?;
+    let line_number = caps.get(4)?.as_str().parse::<usize>().ok()?;
 
-    let code = caps.get(5).unwrap().as_str();
+    let code = caps.get(5)?.as_str();
 
     Some(BlameLine {
         commit,

src/options/set.rs

@@ -79,7 +79,7 @@ pub fn set_options(
     }
     opt.navigate = opt.navigate || opt.env.navigate.is_some();
     if opt.syntax_theme.is_none() {
-        opt.syntax_theme.clone_from(&opt.env.bat_theme);
+        opt.syntax_theme = opt.env.bat_theme.take();
     }
 
     let option_names = cli::Opt::get_argument_and_option_names();