Skip to content

Commit 43cdec0

Browse files
committed
Rustfmt
1 parent 6b6b28f commit 43cdec0

File tree

9 files changed

+151
-192
lines changed

9 files changed

+151
-192
lines changed

src/external_trait_impls/rayon/helpers.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@ use alloc::vec::Vec;
33

44
use rayon::iter::{IntoParallelIterator, ParallelIterator};
55

6-
76
/// Helper for collecting parallel iterators to an intermediary
87
pub(super) fn collect<I: IntoParallelIterator>(iter: I) -> (LinkedList<Vec<I::Item>>, usize) {
98
let list = iter
109
.into_par_iter()
1110
.fold(Vec::new, |mut vec, elem| {
1211
vec.push(elem);
1312
vec
14-
}).map(|vec| {
13+
})
14+
.map(|vec| {
1515
let mut list = LinkedList::new();
1616
list.push_back(vec);
1717
list
18-
}).reduce(LinkedList::new, |mut list1, mut list2| {
18+
})
19+
.reduce(LinkedList::new, |mut list1, mut list2| {
1920
list1.append(&mut list2);
2021
list1
2122
});

src/external_trait_impls/rayon/map.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ use super::raw;
1111
pub use super::raw::{IntoParIter, ParIter, ParIterMut};
1212
pub use super::raw::{ParKeys, ParValues, ParValuesMut};
1313

14-
1514
impl<K: Sync, V, S> HashMap<K, V, S> {
1615
/// Visits (potentially in parallel) immutably borrowed keys in an arbitrary order.
1716
#[inline]
@@ -47,13 +46,13 @@ where
4746
///
4847
/// This method runs in a potentially parallel fashion.
4948
pub fn par_eq(&self, other: &Self) -> bool {
50-
self.len() == other.len() && self
51-
.into_par_iter()
52-
.all(|(key, value)| other.get(key).map_or(false, |v| *value == *v))
49+
self.len() == other.len()
50+
&& self
51+
.into_par_iter()
52+
.all(|(key, value)| other.get(key).map_or(false, |v| *value == *v))
5353
}
5454
}
5555

56-
5756
impl<K: Send, V: Send, S> IntoParallelIterator for HashMap<K, V, S> {
5857
type Item = (K, V);
5958
type Iter = raw::IntoParIter<K, V>;
@@ -81,7 +80,6 @@ impl<'a, K: Sync, V: Send, S> IntoParallelIterator for &'a mut HashMap<K, V, S>
8180
}
8281
}
8382

84-
8583
/// Collect (key, value) pairs from a parallel iterator into a
8684
/// hashmap. If multiple pairs correspond to the same key, then the
8785
/// ones produced earlier in the parallel iterator will be
@@ -153,7 +151,6 @@ where
153151
}
154152
}
155153

156-
157154
#[cfg(test)]
158155
mod test_par_map {
159156
use alloc::vec::Vec;

src/external_trait_impls/rayon/raw.rs

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use rayon::iter::{
1212

1313
use raw::{RawIterRange, RawTable};
1414

15-
1615
#[inline]
1716
unsafe fn raw_iter_range_split_and_convert<T, P>(iter_range: RawIterRange<T>) -> (P, Option<P>)
1817
where
@@ -22,7 +21,6 @@ where
2221
(P::from(left), right.map(P::from))
2322
}
2423

25-
2624
/// Parallel iterator over shared references to entries in a map.
2725
///
2826
/// This iterator is created by the [`par_iter`] method on [`HashMap`]
@@ -52,7 +50,8 @@ impl<'a, K: Sync, V: Sync> ParallelIterator for ParIter<'a, K, V> {
5250
type Item = (&'a K, &'a V);
5351

5452
fn drive_unindexed<C>(self, consumer: C) -> C::Result
55-
where C: UnindexedConsumer<Self::Item>
53+
where
54+
C: UnindexedConsumer<Self::Item>,
5655
{
5756
let buckets = unsafe { self.table.iter().iter };
5857
let producer = ParIterProducer::from(buckets);
@@ -62,7 +61,9 @@ impl<'a, K: Sync, V: Sync> ParallelIterator for ParIter<'a, K, V> {
6261

6362
impl<'a, K, V> Clone for ParIter<'a, K, V> {
6463
fn clone(&self) -> Self {
65-
ParIter { table: &*self.table }
64+
ParIter {
65+
table: &*self.table,
66+
}
6667
}
6768
}
6869

@@ -86,7 +87,10 @@ struct ParIterProducer<'a, K: 'a, V: 'a> {
8687
impl<'a, K, V> From<RawIterRange<(K, V)>> for ParIterProducer<'a, K, V> {
8788
#[inline]
8889
fn from(iter: RawIterRange<(K, V)>) -> Self {
89-
Self { iter, marker: PhantomData }
90+
Self {
91+
iter,
92+
marker: PhantomData,
93+
}
9094
}
9195
}
9296

@@ -100,7 +104,8 @@ impl<'a, K: Sync, V: Sync> UnindexedProducer for ParIterProducer<'a, K, V> {
100104
}
101105

102106
fn fold_with<F>(self, folder: F) -> F
103-
where F: Folder<Self::Item>
107+
where
108+
F: Folder<Self::Item>,
104109
{
105110
let iter = self.iter.map(|bucket| unsafe {
106111
let (ref k, ref v) = *bucket.as_ref();
@@ -110,7 +115,6 @@ impl<'a, K: Sync, V: Sync> UnindexedProducer for ParIterProducer<'a, K, V> {
110115
}
111116
}
112117

113-
114118
/// Parallel iterator over shared references to keys in a map.
115119
///
116120
/// This iterator is created by the [`par_keys`] method on [`HashMap`].
@@ -146,16 +150,16 @@ impl<'a, K: Sync, V> ParallelIterator for ParKeys<'a, K, V> {
146150

147151
impl<'a, K, V> Clone for ParKeys<'a, K, V> {
148152
fn clone(&self) -> Self {
149-
ParKeys { table: &*self.table }
153+
ParKeys {
154+
table: &*self.table,
155+
}
150156
}
151157
}
152158

153159
impl<'a, K: fmt::Debug, V> fmt::Debug for ParKeys<'a, K, V> {
154160
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
155161
let iter = unsafe { self.table.iter() };
156-
let entries = iter.map(|bucket| unsafe {
157-
&bucket.as_ref().0
158-
});
162+
let entries = iter.map(|bucket| unsafe { &bucket.as_ref().0 });
159163

160164
f.debug_list().entries(entries).finish()
161165
}
@@ -169,7 +173,10 @@ struct ParKeysProducer<'a, K: 'a, V: 'a> {
169173
impl<'a, K, V> From<RawIterRange<(K, V)>> for ParKeysProducer<'a, K, V> {
170174
#[inline]
171175
fn from(iter: RawIterRange<(K, V)>) -> Self {
172-
Self { iter, marker: PhantomData }
176+
Self {
177+
iter,
178+
marker: PhantomData,
179+
}
173180
}
174181
}
175182

@@ -186,14 +193,11 @@ impl<'a, K: Sync, V> UnindexedProducer for ParKeysProducer<'a, K, V> {
186193
where
187194
F: Folder<Self::Item>,
188195
{
189-
let iter = self.iter.map(|bucket| unsafe {
190-
&bucket.as_ref().0
191-
});
196+
let iter = self.iter.map(|bucket| unsafe { &bucket.as_ref().0 });
192197
folder.consume_iter(iter)
193198
}
194199
}
195200

196-
197201
/// Parallel iterator over shared references to values in a map.
198202
///
199203
/// This iterator is created by the [`par_values`] method on [`HashMap`].
@@ -229,16 +233,16 @@ impl<'a, K, V: Sync> ParallelIterator for ParValues<'a, K, V> {
229233

230234
impl<'a, K, V> Clone for ParValues<'a, K, V> {
231235
fn clone(&self) -> Self {
232-
ParValues { table: &*self.table }
236+
ParValues {
237+
table: &*self.table,
238+
}
233239
}
234240
}
235241

236242
impl<'a, K, V: fmt::Debug> fmt::Debug for ParValues<'a, K, V> {
237243
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
238244
let iter = unsafe { self.table.iter() };
239-
let entries = iter.map(|bucket| unsafe {
240-
&bucket.as_ref().1
241-
});
245+
let entries = iter.map(|bucket| unsafe { &bucket.as_ref().1 });
242246

243247
f.debug_list().entries(entries).finish()
244248
}
@@ -252,7 +256,10 @@ struct ParValuesProducer<'a, K: 'a, V: 'a> {
252256
impl<'a, K, V> From<RawIterRange<(K, V)>> for ParValuesProducer<'a, K, V> {
253257
#[inline]
254258
fn from(iter: RawIterRange<(K, V)>) -> Self {
255-
Self { iter, marker: PhantomData }
259+
Self {
260+
iter,
261+
marker: PhantomData,
262+
}
256263
}
257264
}
258265

@@ -269,14 +276,11 @@ impl<'a, K, V: Sync> UnindexedProducer for ParValuesProducer<'a, K, V> {
269276
where
270277
F: Folder<Self::Item>,
271278
{
272-
let iter = self.iter.map(|bucket| unsafe {
273-
&bucket.as_ref().1
274-
});
279+
let iter = self.iter.map(|bucket| unsafe { &bucket.as_ref().1 });
275280
folder.consume_iter(iter)
276281
}
277282
}
278283

279-
280284
/// Parallel iterator over mutable references to entries in a map.
281285
///
282286
/// This iterator is created by the [`par_iter_mut`] method on [`HashMap`]
@@ -336,7 +340,10 @@ struct ParIterMutProducer<'a, K: 'a, V: 'a> {
336340
impl<'a, K, V> From<RawIterRange<(K, V)>> for ParIterMutProducer<'a, K, V> {
337341
#[inline]
338342
fn from(iter: RawIterRange<(K, V)>) -> Self {
339-
Self { iter, marker: PhantomData }
343+
Self {
344+
iter,
345+
marker: PhantomData,
346+
}
340347
}
341348
}
342349

@@ -361,7 +368,6 @@ impl<'a, K: Sync, V: Send> UnindexedProducer for ParIterMutProducer<'a, K, V> {
361368
}
362369
}
363370

364-
365371
/// Parallel iterator over mutable references to values in a map.
366372
///
367373
/// This iterator is created by the [`par_values_mut`] method on [`HashMap`].
@@ -398,9 +404,7 @@ impl<'a, K, V: Send> ParallelIterator for ParValuesMut<'a, K, V> {
398404
impl<'a, K, V: fmt::Debug> fmt::Debug for ParValuesMut<'a, K, V> {
399405
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
400406
let iter = unsafe { self.table.iter() };
401-
let entries = iter.map(|bucket| unsafe {
402-
&bucket.as_ref().1
403-
});
407+
let entries = iter.map(|bucket| unsafe { &bucket.as_ref().1 });
404408

405409
f.debug_list().entries(entries).finish()
406410
}
@@ -415,7 +419,10 @@ struct ParValuesMutProducer<'a, K: 'a, V: 'a> {
415419
impl<'a, K, V> From<RawIterRange<(K, V)>> for ParValuesMutProducer<'a, K, V> {
416420
#[inline]
417421
fn from(iter: RawIterRange<(K, V)>) -> Self {
418-
Self { iter, marker: PhantomData }
422+
Self {
423+
iter,
424+
marker: PhantomData,
425+
}
419426
}
420427
}
421428

@@ -432,14 +439,11 @@ impl<'a, K, V: Send> UnindexedProducer for ParValuesMutProducer<'a, K, V> {
432439
where
433440
F: Folder<Self::Item>,
434441
{
435-
let iter = self.iter.map(|bucket| unsafe {
436-
&mut bucket.as_mut().1
437-
});
442+
let iter = self.iter.map(|bucket| unsafe { &mut bucket.as_mut().1 });
438443
folder.consume_iter(iter)
439444
}
440445
}
441446

442-
443447
/// Parallel iterator over entries of a consumed map.
444448
///
445449
/// This iterator is created by the [`into_par_iter`] method on [`HashMap`]
@@ -512,9 +516,7 @@ impl<K: Send, V: Send> UnindexedProducer for IntoParIterProducer<K, V> {
512516
where
513517
F: Folder<Self::Item>,
514518
{
515-
let iter = self.iter.by_ref().map(|bucket| unsafe {
516-
bucket.read()
517-
});
519+
let iter = self.iter.by_ref().map(|bucket| unsafe { bucket.read() });
518520
folder.consume_iter(iter)
519521
}
520522
}

src/external_trait_impls/rayon/set.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
use core::hash::{BuildHasher, Hash};
44

55
use rayon::iter::{
6-
plumbing::UnindexedConsumer,
7-
FromParallelIterator, IntoParallelIterator, ParallelExtend, ParallelIterator,
6+
plumbing::UnindexedConsumer, FromParallelIterator, IntoParallelIterator, ParallelExtend,
7+
ParallelIterator,
88
};
99

1010
use hash_set::HashSet;
1111

1212
use super::map;
1313

14-
1514
/// Parallel iterator over elements of a consumed set.
1615
///
1716
/// This iterator is created by the [`into_par_iter`] method on [`HashSet`]
@@ -349,7 +348,6 @@ where
349348
}
350349
}
351350

352-
353351
#[cfg(test)]
354352
mod test_par_set {
355353
use alloc::vec::Vec;
@@ -450,7 +448,8 @@ mod test_par_set {
450448
.map(|x| {
451449
assert!(expected.contains(x));
452450
1
453-
}).sum::<usize>();
451+
})
452+
.sum::<usize>();
454453
assert_eq!(i, expected.len());
455454
}
456455

@@ -474,7 +473,8 @@ mod test_par_set {
474473
.map(|x| {
475474
assert!(expected.contains(x));
476475
1
477-
}).sum::<usize>();
476+
})
477+
.sum::<usize>();
478478
assert_eq!(i, expected.len());
479479
}
480480

@@ -501,7 +501,8 @@ mod test_par_set {
501501
.map(|x| {
502502
assert!(expected.contains(x));
503503
1
504-
}).sum::<usize>();
504+
})
505+
.sum::<usize>();
505506
assert_eq!(i, expected.len());
506507
}
507508

@@ -532,7 +533,8 @@ mod test_par_set {
532533
.map(|x| {
533534
assert!(expected.contains(x));
534535
1
535-
}).sum::<usize>();
536+
})
537+
.sum::<usize>();
536538
assert_eq!(i, expected.len());
537539
}
538540

src/external_trait_impls/serde.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ mod map {
8080
}
8181
}
8282

83-
let visitor = MapVisitor { marker: PhantomData };
83+
let visitor = MapVisitor {
84+
marker: PhantomData,
85+
};
8486
deserializer.deserialize_map(visitor)
8587
}
8688
}
@@ -153,7 +155,9 @@ mod set {
153155
}
154156
}
155157

156-
let visitor = SeqVisitor { marker: PhantomData };
158+
let visitor = SeqVisitor {
159+
marker: PhantomData,
160+
};
157161
deserializer.deserialize_seq(visitor)
158162
}
159163

0 commit comments

Comments
 (0)