aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
authorBastien Orivel <eijebong@bananium.fr>2019-06-24 23:04:13 +0200
committerBastien Orivel <eijebong@bananium.fr>2019-07-12 21:01:33 +0200
commit28fa0f8009e78d6bd9dead87f82eba83df1189e8 (patch)
tree940f7e27709da5b2450d2872e94af5b8a9337de7 /tests/unit
parentdf73c71fb18c144abedd6889c34dd1031ffcbb8e (diff)
downloadservo-28fa0f8009e78d6bd9dead87f82eba83df1189e8.tar.gz
servo-28fa0f8009e78d6bd9dead87f82eba83df1189e8.zip
Update rayon to dedupe crossbeam-epoch
As a bonus this also removes one version of crossbeam-utils
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/style/rule_tree/bench.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/unit/style/rule_tree/bench.rs b/tests/unit/style/rule_tree/bench.rs
index 1c561a1f215..a11174c6c35 100644
--- a/tests/unit/style/rule_tree/bench.rs
+++ b/tests/unit/style/rule_tree/bench.rs
@@ -187,13 +187,13 @@ fn bench_insertion_basic_parallel(b: &mut Bencher) {
b.iter(|| {
let _gc = AutoGCRuleTree::new(&r, &lock);
- rayon::scope(|s| {
+ rayon::scope_fifo(|s| {
for _ in 0..4 {
- s.spawn(|s| {
+ s.spawn_fifo(|s| {
for _ in 0..1000 {
test::black_box(test_insertion(&r, rules_matched.clone()));
}
- s.spawn(|_| {
+ s.spawn_fifo(|_| {
for _ in 0..100 {
test::black_box(test_insertion(&r, rules_matched.clone()));
}
@@ -220,13 +220,13 @@ fn bench_expensive_insertion_parallel(b: &mut Bencher) {
b.iter(|| {
let _gc = AutoGCRuleTree::new(&r, &lock);
- rayon::scope(|s| {
+ rayon::scope_fifo(|s| {
for _ in 0..4 {
- s.spawn(|s| {
+ s.spawn_fifo(|s| {
for _ in 0..1000 {
test::black_box(test_insertion_style_attribute(&r, &rules_matched, &lock));
}
- s.spawn(|_| {
+ s.spawn_fifo(|_| {
for _ in 0..100 {
test::black_box(test_insertion_style_attribute(
&r,