diff --git a/benches/flat_scope.rs b/benches/flat_scope.rs index 3e42292..0300417 100644 --- a/benches/flat_scope.rs +++ b/benches/flat_scope.rs @@ -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); diff --git a/benches/flood_fill.rs b/benches/flood_fill.rs index 627ba6b..c2f850f 100644 --- a/benches/flood_fill.rs +++ b/benches/flood_fill.rs @@ -78,13 +78,12 @@ 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) }); } } @@ -92,8 +91,8 @@ fn forte(bencher: Bencher, size: usize) { // 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) }); } } @@ -101,8 +100,8 @@ fn forte(bencher: Bencher, size: usize) { // 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) }); } } @@ -110,8 +109,8 @@ fn forte(bencher: Bencher, size: usize) { // 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) }); } } @@ -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); }); }); });