From 9db046795e88d4ce170f0e47a0d4eb0e51e59d59 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Wed, 2 Oct 2024 23:13:49 +0200
Subject: [PATCH] style: remove redundant else blocks

---
 Cargo.toml                             |   1 +
 cli/src/cli_util.rs                    |  12 +++++-------
 cli/src/commands/file/untrack.rs       |   7 +++----
 cli/src/commands/workspace/.add.rs.swp | Bin 0 -> 16384 bytes
 cli/src/commands/workspace/add.rs      |   3 +--
 lib/src/default_index/rev_walk.rs      |   5 ++---
 lib/src/default_index/store.rs         |   4 +---
 lib/src/file_util.rs                   |   8 ++++----
 lib/src/merged_tree.rs                 |   3 +--
 lib/src/simple_op_store.rs             |   8 ++++----
 10 files changed, 22 insertions(+), 29 deletions(-)
 create mode 100644 cli/src/commands/workspace/.add.rs.swp

diff --git a/Cargo.toml b/Cargo.toml
index 50062118d3..819f417c14 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -135,6 +135,7 @@ testutils = { path = "lib/testutils" }
 [workspace.lints.clippy]
 explicit_iter_loop = "deny"
 implicit_clone = "deny"
+redundant_else = "deny"
 semicolon_if_nothing_returned = "deny"
 uninlined_format_args = "deny"
 
diff --git a/cli/src/cli_util.rs b/cli/src/cli_util.rs
index 301e9b2382..bd0c031c73 100644
--- a/cli/src/cli_util.rs
+++ b/cli/src/cli_util.rs
@@ -3009,15 +3009,13 @@ fn resolve_aliases(
                         string_args.extend_from_slice(&alias_args);
                         resolved_aliases.insert(alias_name.clone());
                         continue;
-                    } else {
-                        return Err(user_error(format!(
-                            r#"Alias definition for "{alias_name}" must be a string list"#
-                        )));
                     }
-                } else {
-                    // Not a real command and not an alias, so return what we've resolved so far
-                    return Ok(string_args);
+                    return Err(user_error(format!(
+                        r#"Alias definition for "{alias_name}" must be a string list"#
+                    )));
                 }
+                // Not a real command and not an alias, so return what we've resolved so far
+                return Ok(string_args);
             }
         }
         // No more alias commands, or hit unknown option
diff --git a/cli/src/commands/file/untrack.rs b/cli/src/commands/file/untrack.rs
index 97752226b0..933d024f99 100644
--- a/cli/src/commands/file/untrack.rs
+++ b/cli/src/commands/file/untrack.rs
@@ -97,11 +97,10 @@ pub(crate) fn cmd_file_untrack(
                 "Files that are not ignored will be added back by the next command.
 Make sure they're ignored, then try again.",
             ));
-        } else {
-            // This means there were some concurrent changes made in the working copy. We
-            // don't want to mix those in, so reset the working copy again.
-            locked_ws.locked_wc().reset(&new_commit)?;
         }
+        // This means there were some concurrent changes made in the working copy. We
+        // don't want to mix those in, so reset the working copy again.
+        locked_ws.locked_wc().reset(&new_commit)?;
     }
     let num_rebased = tx.repo_mut().rebase_descendants(command.settings())?;
     if num_rebased > 0 {
diff --git a/cli/src/commands/workspace/.add.rs.swp b/cli/src/commands/workspace/.add.rs.swp
new file mode 100644
index 0000000000000000000000000000000000000000..9581019b574f80e260026c05cff92a6ff4fc2497
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/cli/src/commands/workspace/add.rs b/cli/src/commands/workspace/add.rs
index 0d61d99b50..e761399c6c 100644
--- a/cli/src/commands/workspace/add.rs
+++ b/cli/src/commands/workspace/add.rs
@@ -85,9 +85,8 @@ pub fn cmd_workspace_add(
     let destination_path = command.cwd().join(&args.destination);
     if destination_path.exists() {
         return Err(user_error("Workspace already exists"));
-    } else {
-        fs::create_dir(&destination_path).context(&destination_path)?;
     }
+    fs::create_dir(&destination_path).context(&destination_path)?;
     let name = if let Some(name) = &args.name {
         name.to_string()
     } else {
diff --git a/lib/src/default_index/rev_walk.rs b/lib/src/default_index/rev_walk.rs
index 43ff667bf1..0a4bf974a9 100644
--- a/lib/src/default_index/rev_walk.rs
+++ b/lib/src/default_index/rev_walk.rs
@@ -526,10 +526,9 @@ impl<I: RevWalkIndex + ?Sized> RevWalk<I> for RevWalkImpl<I::Position> {
                 // No more wanted entries to walk
                 debug_assert!(!self.queue.items.iter().any(|x| x.is_wanted()));
                 return None;
-            } else {
-                self.queue
-                    .extend_unwanted(index.adjacent_positions(item.pos));
             }
+            self.queue
+                .extend_unwanted(index.adjacent_positions(item.pos));
         }
 
         debug_assert_eq!(
diff --git a/lib/src/default_index/store.rs b/lib/src/default_index/store.rs
index de5b7f3191..8c516a0dec 100644
--- a/lib/src/default_index/store.rs
+++ b/lib/src/default_index/store.rs
@@ -354,9 +354,7 @@ impl IndexStore for DefaultIndexStore {
                         );
                     }
                     ReadonlyIndexLoadError::Other { name: _, error } => {
-                        eprintln!(
-                            "{err} (maybe the format has changed): {error}. Reindexing..."
-                        );
+                        eprintln!("{err} (maybe the format has changed): {error}. Reindexing...");
                     }
                 }
                 self.reinit().map_err(|err| IndexReadError(err.into()))?;
diff --git a/lib/src/file_util.rs b/lib/src/file_util.rs
index 12c83afe9c..548ebcae4c 100644
--- a/lib/src/file_util.rs
+++ b/lib/src/file_util.rs
@@ -92,13 +92,13 @@ pub fn relative_path(from: &Path, to: &Path) -> PathBuf {
     // Find common prefix.
     for (i, base) in from.ancestors().enumerate() {
         if let Ok(suffix) = to.strip_prefix(base) {
-            if i == 0 && suffix.as_os_str().is_empty() {
-                return ".".into();
+            return if i == 0 && suffix.as_os_str().is_empty() {
+                ".".into()
             } else {
                 let mut result = PathBuf::from_iter(iter::repeat("..").take(i));
                 result.push(suffix);
-                return result;
-            }
+                result
+            };
         }
     }
 
diff --git a/lib/src/merged_tree.rs b/lib/src/merged_tree.rs
index 81090aedb0..45db0a2a14 100644
--- a/lib/src/merged_tree.rs
+++ b/lib/src/merged_tree.rs
@@ -783,9 +783,8 @@ impl Iterator for TreeDiffIterator<'_> {
                             path,
                             values: Ok((before, after)),
                         });
-                    } else {
-                        unreachable!();
                     }
+                    unreachable!();
                 }
             };
 
diff --git a/lib/src/simple_op_store.rs b/lib/src/simple_op_store.rs
index 1cadb9ce9a..36b9c60463 100644
--- a/lib/src/simple_op_store.rs
+++ b/lib/src/simple_op_store.rs
@@ -212,12 +212,12 @@ impl OpStore for SimpleOpStore {
             let hex_prefix = prefix.hex();
             if hex_prefix.len() == OPERATION_ID_LENGTH * 2 {
                 // Fast path for full-length ID
-                if matches_root || op_dir.join(hex_prefix).try_exists()? {
+                return Ok(if matches_root || op_dir.join(hex_prefix).try_exists()? {
                     let id = OperationId::from_bytes(prefix.as_full_bytes().unwrap());
-                    return Ok(PrefixResolution::SingleMatch(id));
+                    PrefixResolution::SingleMatch(id)
                 } else {
-                    return Ok(PrefixResolution::NoMatch);
-                }
+                    PrefixResolution::NoMatch
+                });
             }
 
             let mut matched = matches_root.then(|| self.root_operation_id.clone());