Update to rayon 1.6.1, remove jwalk_par_bridge

jwalk had need custom par_bridge implementation to avoid locking in some cases. Rayon 1.6.1 makes this no longer a problem. See walk_rayon_no_lockup test case.
Byron · Dec 11, 2022 · 94c0385 · 94c0385
1 parent 9575132
commit 94c0385
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 228 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,7 @@ crossbeam = "0.8"
 
 [dev-dependencies]
 criterion = "0.3"
-fs_extra = "1.1"
+fs_extra = "1.2"
 walkdir = "2.3"
 ignore = "0.4"
 tempfile = "3.1"

diff --git a/src/core/jwalk_par_bridge.rs b/src/core/jwalk_par_bridge.rs
diff --git a/src/core/mod.rs b/src/core/mod.rs
@@ -2,7 +2,6 @@ mod dir_entry;
 mod dir_entry_iter;
 mod error;
 mod index_path;
-mod jwalk_par_bridge;
 mod ordered;
 mod ordered_queue;
 mod read_dir;
@@ -21,7 +20,6 @@ use ordered_queue::*;
 use read_dir_iter::*;
 use run_context::*;
 
-pub use self::jwalk_par_bridge::{JWalkIterBridge, JWalkParallelBridge};
 pub use dir_entry::DirEntry;
 pub use dir_entry_iter::DirEntryIter;
 pub use error::Error;

diff --git a/src/core/read_dir_iter.rs b/src/core/read_dir_iter.rs
@@ -57,7 +57,7 @@ impl<C: ClientState> ReadDirIter<C> {
 
                 parallelism.install(move || {
                     rayon::spawn(|| {
-                        read_dir_spec_iter.jwalk_par_bridge().for_each_with(
+                        read_dir_spec_iter.par_bridge().for_each_with(
                             run_context,
                             |run_context, ordered_read_dir_spec| {
                                 multi_threaded_walk_dir(ordered_read_dir_spec, run_context);

diff --git a/tests/mod.rs b/tests/mod.rs
@@ -1028,7 +1028,9 @@ fn walk_rayon_global() {
 
 #[test]
 fn walk_rayon_no_lockup() {
-    // Without jwalk_par_bridge this locks
+    // Without jwalk_par_bridge this locks (pre rayon 1.6.1)
+    // This test now passes without needing jwalk_par_bridge
+    // and that code has been removed from jwalk.
     let pool = std::sync::Arc::new(
         rayon::ThreadPoolBuilder::new()
             .num_threads(1)