@@ -230,18 +230,18 @@ impl ResolvedPackages {
230230
231231 /// Returns an iterator yielding the best version per unique package name.
232232 pub fn iter ( & self ) -> impl Iterator < Item = ( & String , & ResolvedPackage ) > {
233- self . packages
234- . keys ( )
235- . filter_map ( |name| self . packages . get ( name) . and_then ( |v| best_package ( v) . map ( |p| ( name, p) ) ) )
233+ self . packages . keys ( ) . filter_map ( |name| {
234+ self . packages
235+ . get ( name)
236+ . and_then ( |v| best_package ( v) . map ( |p| ( name, p) ) )
237+ } )
236238 }
237239
238240 /// Converts into a HashMap with the best version per package name.
239241 pub fn into_map ( self ) -> HashMap < String , ResolvedPackage > {
240242 self . packages
241243 . into_iter ( )
242- . filter_map ( |( name, versions) | {
243- best_package ( & versions) . cloned ( ) . map ( |p| ( name, p) )
244- } )
244+ . filter_map ( |( name, versions) | best_package ( & versions) . cloned ( ) . map ( |p| ( name, p) ) )
245245 . collect ( )
246246 }
247247}
@@ -570,18 +570,14 @@ mod tests {
570570 packages. insert ( ResolvedPackage {
571571 name : "weird" . into ( ) ,
572572 version : "abc" . into ( ) ,
573- source : ResolvedSource :: Path {
574- path : "." . into ( ) ,
575- } ,
573+ source : ResolvedSource :: Path { path : "." . into ( ) } ,
576574 dependencies : vec ! [ ] ,
577575 } ) ;
578576
579577 packages. insert ( ResolvedPackage {
580578 name : "weird" . into ( ) ,
581579 version : "xyz" . into ( ) ,
582- source : ResolvedSource :: Path {
583- path : "." . into ( ) ,
584- } ,
580+ source : ResolvedSource :: Path { path : "." . into ( ) } ,
585581 dependencies : vec ! [ ] ,
586582 } ) ;
587583
@@ -596,18 +592,14 @@ mod tests {
596592 packages. insert ( ResolvedPackage {
597593 name : "mixed" . into ( ) ,
598594 version : "not-a-version" . into ( ) ,
599- source : ResolvedSource :: Path {
600- path : "." . into ( ) ,
601- } ,
595+ source : ResolvedSource :: Path { path : "." . into ( ) } ,
602596 dependencies : vec ! [ ] ,
603597 } ) ;
604598
605599 packages. insert ( ResolvedPackage {
606600 name : "mixed" . into ( ) ,
607601 version : "1.0.0" . into ( ) ,
608- source : ResolvedSource :: Path {
609- path : "." . into ( ) ,
610- } ,
602+ source : ResolvedSource :: Path { path : "." . into ( ) } ,
611603 dependencies : vec ! [ ] ,
612604 } ) ;
613605
0 commit comments