From 844b20b9c94154f34ebe60b6166355bb8f2a52df Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Sat, 9 Dec 2023 13:26:21 -0800 Subject: [PATCH] Use parallel feature on remove_dir_all for Windows Signed-off-by: Alex Saveau --- Cargo.lock | 47 ++++++++++++------------ Cargo.toml | 2 +- comparisons/rm_og_crappy/Cargo.toml | 2 +- comparisons/rm_remove_dir_all/Cargo.toml | 2 +- cpz/Cargo.toml | 4 +- fuc_engine/Cargo.toml | 6 +-- rmz/Cargo.toml | 10 ++--- 7 files changed, 37 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9c29539..9398a95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,9 +43,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" dependencies = [ "anstyle", "anstyle-parse", @@ -72,9 +72,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ "windows-sys 0.52.0", ] @@ -778,9 +778,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" @@ -908,9 +908,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -1146,6 +1146,7 @@ dependencies = [ "lazy_static", "libc", "normpath", + "rayon", "windows-sys 0.45.0", ] @@ -1260,9 +1261,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.26" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", @@ -1273,9 +1274,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "same-file" @@ -1375,9 +1376,9 @@ dependencies = [ [[package]] name = "snapbox" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b377c0b6e4715c116473d8e40d51e3fa5b0a2297ca9b2a931ba800667b259ed" +checksum = "c4f1976ee8fd1be27d5f72c98be0aac4397a882a4736935d47418a5fbbd12042" dependencies = [ "anstream", "anstyle", @@ -1392,7 +1393,7 @@ dependencies = [ "tempfile", "wait-timeout", "walkdir", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1418,9 +1419,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "supercilex-tests" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65fd835f39d674841354dc26fff7f561dce9d3f013025e0c00cf14d6947cb24" +checksum = "cd7a0e1f825df00e78f84861e10b104e208ef40df2f9f832734aabe6228726f0" dependencies = [ "clap_builder", "expect-test", @@ -1441,9 +1442,9 @@ dependencies = [ [[package]] name = "sysexits" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e724941c9890385558cc069867fd6e42f5432018a5de81d7e3c3c66755d12f5" +checksum = "863d0ebf4f8f10e7e33c82f7fe18e2a09952028011bf0cc7a9a3b8df9bb1cf56" [[package]] name = "tempfile" @@ -1506,9 +1507,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.34.0" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" dependencies = [ "backtrace", "pin-project-lite", @@ -1979,9 +1980,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.25" +version = "0.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" +checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 15afe95..dd5fa56 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ version = "0.0.0" publish = false [dev-dependencies] -supercilex-tests = { version = "0.4.2", default-features = false } +supercilex-tests = { version = "0.4.3", default-features = false } [profile.release] lto = true diff --git a/comparisons/rm_og_crappy/Cargo.toml b/comparisons/rm_og_crappy/Cargo.toml index 3f07460..53a3251 100644 --- a/comparisons/rm_og_crappy/Cargo.toml +++ b/comparisons/rm_og_crappy/Cargo.toml @@ -6,4 +6,4 @@ publish = false [dependencies] futures = "0.3.29" -tokio = { version = "1.34.0", features = ["rt"] } +tokio = { version = "1.35.0", features = ["rt"] } diff --git a/comparisons/rm_remove_dir_all/Cargo.toml b/comparisons/rm_remove_dir_all/Cargo.toml index 3c98296..8919cdd 100644 --- a/comparisons/rm_remove_dir_all/Cargo.toml +++ b/comparisons/rm_remove_dir_all/Cargo.toml @@ -5,4 +5,4 @@ edition.workspace = true publish = false [dependencies] -remove_dir_all = "0.8.2" +remove_dir_all = { version = "0.8.2", features = ["parallel"] } diff --git a/cpz/Cargo.toml b/cpz/Cargo.toml index ab7cb6a..4ff1544 100644 --- a/cpz/Cargo.toml +++ b/cpz/Cargo.toml @@ -20,12 +20,12 @@ cache-size = "0.6.0" criterion = "0.5.1" memmap2 = "0.9.0" rand = "0.8.5" -supercilex-tests = { version = "0.4.2", default-features = false, features = ["clap"] } +supercilex-tests = { version = "0.4.3", default-features = false, features = ["clap"] } tempfile = "3.8.1" trycmd = "0.14.19" [target.'cfg(unix)'.dev-dependencies] -rustix = { version = "0.38.26", features = ["fs", "pipe"] } +rustix = { version = "0.38.28", features = ["fs", "pipe"] } [[bench]] name = "copy_methods" diff --git a/fuc_engine/Cargo.toml b/fuc_engine/Cargo.toml index a9d0e38..e350501 100644 --- a/fuc_engine/Cargo.toml +++ b/fuc_engine/Cargo.toml @@ -15,17 +15,17 @@ thiserror = "1.0.50" typed-builder = "0.18.0" [target.'cfg(target_os = "linux")'.dependencies] -rustix = { version = "0.38.26", features = ["fs", "thread", "linux_latest"] } +rustix = { version = "0.38.28", features = ["fs", "thread", "linux_latest"] } [target.'cfg(not(target_os = "linux"))'.dependencies] rayon = "1.8.0" [target.'cfg(target_os = "windows")'.dependencies] -remove_dir_all = "0.8.2" +remove_dir_all = { version = "0.8.2", features = ["parallel"] } [dev-dependencies] ftzz = "2.0.3" io-adapters = "0.1.0" rstest = { version = "0.18.2", default-features = false } -supercilex-tests = { version = "0.4.2", default-features = false, features = ["api"] } +supercilex-tests = { version = "0.4.3", default-features = false, features = ["api"] } tempfile = "3.8.1" diff --git a/rmz/Cargo.toml b/rmz/Cargo.toml index 2ed1610..00bd2f0 100644 --- a/rmz/Cargo.toml +++ b/rmz/Cargo.toml @@ -18,13 +18,13 @@ thiserror = "1.0.50" [dev-dependencies] criterion = "0.5.1" ftzz = "2.0.3" +io-adapters = "0.1.0" +remove_dir_all = { version = "0.8.2", features = ["parallel"] } +rm_og_crappy = { path = "../comparisons/rm_og_crappy" } +rm_rayon = { path = "../comparisons/rm_rayon" } +supercilex-tests = { version = "0.4.3", default-features = false, features = ["clap"] } tempfile = "3.8.1" trycmd = "0.14.19" -rm_rayon = { path = "../comparisons/rm_rayon" } -rm_og_crappy = { path = "../comparisons/rm_og_crappy" } -supercilex-tests = { version = "0.4.2", default-features = false, features = ["clap"] } -remove_dir_all = "0.8.2" -io-adapters = "0.1.0" [[bench]] name = "rmz"