@@ -12,7 +12,6 @@ use rayon::iter::{
1212
1313use raw:: { RawIterRange , RawTable } ;
1414
15-
1615#[ inline]
1716unsafe fn raw_iter_range_split_and_convert < T , P > ( iter_range : RawIterRange < T > ) -> ( P , Option < P > )
1817where
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
6362impl < ' 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> {
8687impl < ' 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
147151impl < ' 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
153159impl < ' 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> {
169173impl < ' 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
230234impl < ' 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
236242impl < ' 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> {
252256impl < ' 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> {
336340impl < ' 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> {
398404impl < ' 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> {
415419impl < ' 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}
0 commit comments