From 83704b6bfb4982cbdca4bf8a9667c695aa3a1098 Mon Sep 17 00:00:00 2001 From: Ingvar Stepanyan Date: Wed, 17 Jan 2024 18:14:42 +0000 Subject: [PATCH] Upgrade to Rayon with spin lock --- Cargo.lock | 11 ++++++----- Cargo.toml | 8 ++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fee7311..f064b85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -180,18 +180,19 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" -source = "git+https://github.com/RReverser/rayon?branch=wasm-sync#bc009a38cad598e706a4167eb65fe7bd42ca7ae8" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", - "wasm_sync", ] [[package]] name = "rayon-core" -version = "1.12.0" -source = "git+https://github.com/RReverser/rayon?branch=wasm-sync#bc009a38cad598e706a4167eb65fe7bd42ca7ae8" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", diff --git a/Cargo.toml b/Cargo.toml index 9a7ac67..136385f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,11 +13,11 @@ repository = "https://github.com/RReverser/wasm-bindgen-rayon" [workspace.dependencies] wasm-bindgen = "0.2.84" -rayon = "1.8" +rayon = "1.8.1" [dependencies] wasm-bindgen = { workspace = true } -rayon-core = "1.12" +rayon-core = { version = "1.12.1", features = ["web_spin_lock"] } crossbeam-channel = "0.5.9" js-sys = "0.3.48" @@ -32,7 +32,3 @@ no-bundler = [] features = ["nightly"] targets = ["wasm32-unknown-unknown"] rustc-args = ["-C", "target-feature=+atomics,+bulk-memory"] - -[patch.crates-io] -rayon = { git = "https://github.com/RReverser/rayon", branch = "wasm-sync" } -rayon-core = { git = "https://github.com/RReverser/rayon", branch = "wasm-sync" }