Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 15 insertions, 13 deletions

diff --git a/vendor/gix-features/src/fs.rs b/vendor/gix-features/src/fs.rs
index f07ac1f0f..20d819547 100644
--- a/vendor/gix-features/src/fs.rs
+++ b/vendor/gix-features/src/fs.rs
@@ -38,19 +38,21 @@ pub mod walkdir {
             match v {
                 Parallelism::Serial => jwalk::Parallelism::Serial,
                 Parallelism::ThreadPoolPerTraversal { thread_name } => std::thread::available_parallelism()
-                    .map(|threads| {
-                        let pool = jwalk::rayon::ThreadPoolBuilder::new()
-                            .num_threads(threads.get().min(16))
-                            .stack_size(128 * 1024)
-                            .thread_name(move |idx| format!("{thread_name} {idx}"))
-                            .build()
-                            .expect("we only set options that can't cause a build failure");
-                        jwalk::Parallelism::RayonExistingPool {
-                            pool: pool.into(),
-                            busy_timeout: None,
-                        }
-                    })
-                    .unwrap_or_else(|_| Parallelism::Serial.into()),
+                    .map_or_else(
+                        |_| Parallelism::Serial.into(),
+                        |threads| {
+                            let pool = jwalk::rayon::ThreadPoolBuilder::new()
+                                .num_threads(threads.get().min(16))
+                                .stack_size(128 * 1024)
+                                .thread_name(move |idx| format!("{thread_name} {idx}"))
+                                .build()
+                                .expect("we only set options that can't cause a build failure");
+                            jwalk::Parallelism::RayonExistingPool {
+                                pool: pool.into(),
+                                busy_timeout: None,
+                            }
+                        },
+                    ),
             }
         }
     }