parent
5840700d97
commit
ed38fb4e84
@ -1,41 +0,0 @@
|
||||
From aaf3296c9470a094f740d004444b45065d00a730 Mon Sep 17 00:00:00 2001
|
||||
From: Josh Stone <cuviper@gmail.com>
|
||||
Date: Wed, 12 Jun 2019 20:45:51 -0700
|
||||
Subject: [PATCH] Update to crossbeam-deque 0.7
|
||||
|
||||
---
|
||||
src/iter/par_bridge.rs | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/iter/par_bridge.rs b/src/iter/par_bridge.rs
|
||||
index b366de698243..c8197ea65a48 100644
|
||||
--- a/src/iter/par_bridge.rs
|
||||
+++ b/src/iter/par_bridge.rs
|
||||
@@ -1,4 +1,4 @@
|
||||
-use crossbeam_deque::{self as deque, Steal, Stealer, Worker};
|
||||
+use crossbeam_deque::{Steal, Stealer, Worker};
|
||||
|
||||
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
|
||||
use std::sync::{Mutex, TryLockError};
|
||||
@@ -79,7 +79,8 @@ where
|
||||
C: UnindexedConsumer<Self::Item>,
|
||||
{
|
||||
let split_count = AtomicUsize::new(current_num_threads());
|
||||
- let (worker, stealer) = deque::fifo();
|
||||
+ let worker = Worker::new_fifo();
|
||||
+ let stealer = worker.stealer();
|
||||
let done = AtomicBool::new(false);
|
||||
let iter = Mutex::new((self.iter, worker));
|
||||
|
||||
@@ -149,7 +150,7 @@ where
|
||||
{
|
||||
loop {
|
||||
match self.items.steal() {
|
||||
- Steal::Data(it) => {
|
||||
+ Steal::Success(it) => {
|
||||
folder = folder.consume(it);
|
||||
if folder.full() {
|
||||
return folder;
|
||||
--
|
||||
2.21.0
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- rayon-1.1.0/Cargo.toml 1970-01-01T00:00:00+00:00
|
||||
+++ rayon-1.1.0/Cargo.toml 2019-06-13T03:54:14.977625+00:00
|
||||
@@ -23,7 +23,7 @@
|
||||
license = "Apache-2.0/MIT"
|
||||
repository = "https://github.com/rayon-rs/rayon"
|
||||
[dependencies.crossbeam-deque]
|
||||
-version = "0.6.3"
|
||||
+version = "0.7.1"
|
||||
|
||||
[dependencies.either]
|
||||
version = "1.0"
|
@ -1 +1 @@
|
||||
SHA512 (rayon-1.1.0.crate) = 6727fb0c2039d196f76c1844395393c0bdf0590f443419d55f2bf5414df98338ba0269d31d8c4531f7b02e473fdcff90eb123cd426e9561858b9d0c028f3b825
|
||||
SHA512 (rayon-1.2.0.crate) = 351f7ddd2600001ef9655f290b743034402a56dcb04a25ac25afeaa549da5e399a8be72cd318d3d4a558d1a190bca7ce03386f3320e9909db48d9d1152154a52
|
||||
|
Loading…
Reference in new issue