Skip to content

Commit 88250e6

Browse files
committed
fix: use flatten() instead of if let Ok in git.rs
Clippy error: unnecessary if let since only the Ok variant is used.
1 parent 3627334 commit 88250e6

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

core/src/git.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,8 @@ fn install_git_macos() -> Result<()> {
149149
// Move contents from bin to our bin dir
150150
let extracted_bin = install_dir.join("usr").join("bin");
151151
if extracted_bin.exists() {
152-
for entry in std::fs::read_dir(&extracted_bin)? {
153-
if let Ok(entry) = entry {
154-
let _ = std::fs::rename(entry.path(), bin_dir.join(entry.file_name()));
155-
}
152+
for entry in std::fs::read_dir(&extracted_bin)?.flatten() {
153+
let _ = std::fs::rename(entry.path(), bin_dir.join(entry.file_name()));
156154
}
157155
}
158156
}
@@ -314,11 +312,9 @@ fn install_git_windows() -> Result<()> {
314312
let extracted_dir = bin_dir.join(format!("MinGit-{}", version));
315313
if extracted_dir.exists() {
316314
// Move contents up one level
317-
for entry in std::fs::read_dir(&extracted_dir)? {
318-
if let Ok(entry) = entry {
319-
let dest = bin_dir.join(entry.file_name());
320-
let _ = std::fs::rename(entry.path(), dest);
321-
}
315+
for entry in std::fs::read_dir(&extracted_dir)?.flatten() {
316+
let dest = bin_dir.join(entry.file_name());
317+
let _ = std::fs::rename(entry.path(), dest);
322318
}
323319
let _ = std::fs::remove_dir(&extracted_dir);
324320
}

0 commit comments

Comments
 (0)