Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-15 02:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #23630 - Eijebong:dedupe-epoch, r=jdm

Browse source 
Update rayon to dedupe crossbeam-epoch

As a bonus this also removes one version of crossbeam-utils

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23630)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-07-17 20:01:07 -04:00 • committed by GitHub
commit 91d12669e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 39 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/unit/style/rule_tree/bench.rs
View file

@ -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,