Skip to content

Commit a902c03

Browse files
bors[bot]cuviper
bors[bot]
and
cuviper
committed
618: cargo fmt r=cuviper a=cuviper Co-authored-by: Josh Stone <[email protected]>
2 parents f36055b + 91143a7 commit a902c03

File tree

36 files changed

+225
-163
lines changed

36 files changed

+225
-163
lines changed

‎rayon-core/src/registry.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,8 @@ impl WorkerThread {
648648
Steal::Retry => {}
649649
}
650650
}
651-
}).next()
651+
})
652+
.next()
652653
}
653654
}
654655

‎rayon-demo/src/fibonacci/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ fn fibonacci_split_recursive(b: &mut test::Bencher) {
8888
} else {
8989
(n - 2, Some(n - 1))
9090
}
91-
}).map(fib_recursive)
91+
})
92+
.map(fib_recursive)
9293
.sum()
9394
}
9495

@@ -107,7 +108,8 @@ fn fibonacci_split_iterative(b: &mut test::Bencher) {
107108
} else {
108109
(n - 2, Some(n - 1))
109110
}
110-
}).map(fib_iterative)
111+
})
112+
.map(fib_iterative)
111113
.sum()
112114
}
113115

‎rayon-demo/src/find/mod.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ macro_rules! make_tests {
1616
let mut result: [u32; $n] = [0; $n];
1717
result[0] = x;
1818
result
19-
}).take(10_000_000)
19+
})
20+
.take(10_000_000)
2021
.collect()
2122
};
2223
}
@@ -72,12 +73,10 @@ macro_rules! make_tests {
7273
#[bench]
7374
fn parallel_find_common(b: &mut Bencher) {
7475
b.iter(|| {
75-
assert!(
76-
HAYSTACK
77-
.par_iter()
78-
.find_any(|&&x| x[0] % 1000 == 999)
79-
.is_some()
80-
)
76+
assert!(HAYSTACK
77+
.par_iter()
78+
.find_any(|&&x| x[0] % 1000 == 999)
79+
.is_some())
8180
});
8281
}
8382

‎rayon-demo/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ extern crate time; // nbody, sieve // factorial
5252
#[macro_use]
5353
extern crate lazy_static; // find
5454
extern crate fixedbitset; // tsp
55-
extern crate regex; // tsp
55+
extern crate regex; // tsp
5656
#[cfg(windows)]
5757
extern crate winapi; // life
5858

‎rayon-demo/src/map_collect.rs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ mod util {
4747
vec.push(elem);
4848
vec
4949
},
50-
).for_each(|vec| {
50+
)
51+
.for_each(|vec| {
5152
let mut guard = mutex.lock().unwrap();
5253
guard.extend(vec);
5354
});
@@ -79,7 +80,8 @@ mod util {
7980
vec.push(elem);
8081
vec
8182
},
82-
).collect();
83+
)
84+
.collect();
8385
list.into_iter().fold(HashMap::new(), |mut map, vec| {
8486
map.extend(vec);
8587
map
@@ -100,7 +102,8 @@ mod util {
100102
vec.push(elem);
101103
vec
102104
},
103-
).collect();
105+
)
106+
.collect();
104107

105108
let len = list.iter().map(Vec::len).sum();
106109
list.into_iter()
@@ -124,11 +127,13 @@ mod util {
124127
vec.push(elem);
125128
vec
126129
},
127-
).map(|vec| {
130+
)
131+
.map(|vec| {
128132
let mut list = LinkedList::new();
129133
list.push_back(vec);
130134
list
131-
}).reduce(LinkedList::new, |mut list1, mut list2| {
135+
})
136+
.reduce(LinkedList::new, |mut list1, mut list2| {
132137
list1.append(&mut list2);
133138
list1
134139
});
@@ -155,7 +160,8 @@ mod util {
155160
vec.push(elem);
156161
vec
157162
},
158-
).map(|v| vec![v])
163+
)
164+
.map(|v| vec![v])
159165
.reduce(
160166
|| Vec::new(),
161167
|mut left, mut right| {
@@ -185,7 +191,8 @@ mod util {
185191
map.insert(k, v);
186192
map
187193
},
188-
).reduce(
194+
)
195+
.reduce(
189196
|| HashMap::new(),
190197
|mut map1, mut map2| {
191198
if map1.len() > map2.len() {
@@ -212,7 +219,8 @@ mod util {
212219
vec.push(elem);
213220
vec
214221
},
215-
).map(HashMap::from_iter)
222+
)
223+
.map(HashMap::from_iter)
216224
.reduce(
217225
|| HashMap::new(),
218226
|mut map1, map2| {

‎rayon-demo/src/nbody/nbody.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ impl NBodyBenchmark {
8080
velocity: velocity,
8181
velocity2: velocity2,
8282
}
83-
}).collect();
83+
})
84+
.collect();
8485

8586
let bodies1 = bodies0.clone();
8687

@@ -432,7 +433,8 @@ fn next_velocity_par(time: usize, prev: &Body, bodies: &[Body]) -> (Vector3<f64>
432433

433434
(diff, diff2)
434435
},
435-
).reduce(
436+
)
437+
.reduce(
436438
|| (Vector3::zero(), Vector3::zero()),
437439
|(diffa, diff2a), (diffb, diff2b)| (diffa + diffb, diff2a + diff2b),
438440
);

‎rayon-demo/src/nbody/visualize.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ pub fn visualize_benchmarks(num_bodies: usize, mut mode: ExecutionMode) {
130130
rng.gen_range(0.5, 1.0),
131131
],
132132
world_position: [0.0, 0.0, 0.0],
133-
}).collect();
133+
})
134+
.collect();
134135

135136
let mut instance_buffer = VertexBuffer::dynamic(&display, &instances).unwrap();
136137

@@ -182,7 +183,8 @@ pub fn visualize_benchmarks(num_bodies: usize, mut mode: ExecutionMode) {
182183
&program,
183184
&uniform! { matrix: view_proj },
184185
&params,
185-
).unwrap();
186+
)
187+
.unwrap();
186188
target.finish().unwrap();
187189

188190
let mut done = false;

‎rayon-demo/src/pythagoras/mod.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ where
2929
.filter(|n| (m - n).is_odd() && m.gcd(n) == 1)
3030
.map(|n| 4000000 / (m * m + n * n))
3131
.sum()
32-
}).sum()
32+
})
33+
.sum()
3334
}
3435

3536
/// Same as par_euclid, without tweaking split lengths
@@ -42,7 +43,8 @@ fn par_euclid_weightless() -> u32 {
4243
.filter(|n| (m - n).is_odd() && m.gcd(n) == 1)
4344
.map(|n| 4000000 / (m * m + n * n))
4445
.sum()
45-
}).sum()
46+
})
47+
.sum()
4648
}
4749

4850
/// Same as par_euclid, without using rayon.
@@ -53,7 +55,8 @@ fn euclid() -> u32 {
5355
.filter(|n| (m - n).is_odd() && m.gcd(n) == 1)
5456
.map(|n| 4000000 / (m * m + n * n))
5557
.fold(0, Add::add)
56-
}).fold(0, Add::add)
58+
})
59+
.fold(0, Add::add)
5760
}
5861

5962
#[bench]

‎rayon-demo/src/quicksort/bench.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ fn quick_sort_splitter(b: &mut test::Bencher) {
4040
} else {
4141
(vec, None)
4242
}
43-
}).for_each(super::quick_sort::<Sequential, u32>)
43+
})
44+
.for_each(super::quick_sort::<Sequential, u32>)
4445
},
4546
b,
4647
);

‎rayon-demo/src/tsp/step.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ fn compute_lower_bound(
8181
} else {
8282
Weight::max()
8383
}
84-
}).collect();
84+
})
85+
.collect();
8586

8687
for i in graph.all_nodes().filter(|&i| !prev_visited.contains(i)) {
8788
for j in graph.all_nodes().filter(|&j| !visited.contains(j)) {

0 commit comments

Comments
 (0)