refactor: repair clippy lints

Author: jpgrayson

src/cmd/series.rs

@@ -525,19 +525,20 @@ fn run(matches: &ArgMatches) -> Result<()> {
     let indices_flag = matches.get_flag("indices");
     let offsets_flag = matches.get_flag("offsets");
 
-    let index_width = (indices_flag && !patches.is_empty())
-        .then(|| patches.last().unwrap().index.to_string().len())
-        .unwrap_or_default();
-
-    let offset_width = (offsets_flag && !patches.is_empty())
-        .then(|| {
-            [patches.first().unwrap(), patches.last().unwrap()]
-                .iter()
-                .map(|entry| format!("{:+}", entry.offset_from_top).len())
-                .max()
-                .unwrap()
-        })
-        .unwrap_or_default();
+    let index_width = if indices_flag && !patches.is_empty() {
+        patches.last().unwrap().index.to_string().len()
+    } else {
+        Default::default()
+    };
+    let offset_width = if offsets_flag && !patches.is_empty() {
+        [patches.first().unwrap(), patches.last().unwrap()]
+            .iter()
+            .map(|entry| format!("{:+}", entry.offset_from_top).len())
+            .max()
+            .unwrap()
+    } else {
+        Default::default()
+    };
 
     let mut stdout = crate::color::get_color_stdout(matches);
     let mut color_spec = termcolor::ColorSpec::new();

src/stack/upgrade.rs

@@ -312,7 +312,7 @@ fn stack_upgrade_from_2(repo: &gix::Repository, branch_name: &str) -> Result<()>
 /// Remove the stack's format version from the config.
 fn rm_stackformatversion(repo: &gix::Repository, branch_name: &str) -> Result<()> {
     let section = "branch";
-    let subsection = format!("{}.stgit", branch_name);
+    let subsection = format!("{branch_name}.stgit");
     let subsection = subsection.as_str();
 
     let mut local_config_file = repo.local_config_file()?;
@@ -337,7 +337,7 @@ fn rm_stackformatversion(repo: &gix::Repository, branch_name: &str) -> Result<()
 /// Set the stack's protected state in the config.
 fn set_protected(repo: &gix::Repository, branch_name: &str) -> Result<()> {
     let section = "branch";
-    let subsection = format!("{}.stgit", branch_name);
+    let subsection = format!("{branch_name}.stgit");
     let subsection = subsection.as_str();
 
     let mut local_config_file = repo.local_config_file()?;