Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benches/flat_scope.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fn forte(bencher: Bencher, size: usize) {
bencher.bench_local(|| {
worker.scope(|scope| {
for i in 0..size {
scope.spawn_on(worker, move |_: &Worker| {
scope.spawn(move |_: &Worker| {
for j in 0..200 {
let mut s = DefaultHasher::new();
i.hash(&mut s);
Expand Down
19 changes: 9 additions & 10 deletions benches/flood_fill.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,40 +78,39 @@ fn forte(bencher: Bencher, size: usize) {
x: usize,
y: usize,
scope: &'scope Scope<'scope, 'env>,
worker: &Worker,
) {
// Visit the y - 1 square
if y > 0 {
if visited.insert((x, y - 1)) {
scope.spawn_on(worker, move |worker: &Worker| {
visit(size, visited, x, y - 1, scope, worker)
scope.spawn(move |_worker: &Worker| {
visit(size, visited, x, y - 1, scope)
});
}
}

// Visit the y + 1 square
if y < size - 1 {
if visited.insert((x, y + 1)) {
scope.spawn_on(worker, move |worker: &Worker| {
visit(size, visited, x, y + 1, scope, worker)
scope.spawn(move |_worker: &Worker| {
visit(size, visited, x, y + 1, scope)
});
}
}

// Visit the x - 1 square
if x > 0 {
if visited.insert((x - 1, y)) {
scope.spawn_on(worker, move |worker: &Worker| {
visit(size, visited, x - 1, y, scope, worker)
scope.spawn(move |_worker: &Worker| {
visit(size, visited, x - 1, y, scope)
});
}
}

// Visit the x + 1 square
if x < size - 1 {
if visited.insert((x + 1, y)) {
scope.spawn_on(worker, move |worker: &Worker| {
visit(size, visited, x + 1, y, scope, worker)
scope.spawn(move |_worker: &Worker| {
visit(size, visited, x + 1, y, scope)
});
}
}
Expand All @@ -128,7 +127,7 @@ fn forte(bencher: Bencher, size: usize) {
let visited = DashSet::new();

worker.scope(|scope| {
visit(size, &visited, size / 2, size / 2, scope, worker);
visit(size, &visited, size / 2, size / 2, scope);
});
});
});
Expand Down
Loading