File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff 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 }
You can’t perform that action at this time.
0 commit comments