@@ -110,22 +110,22 @@ impl Packages {
110
110
}
111
111
112
112
pub fn to_package_id_specs ( & self , ws : & Workspace < ' _ > ) -> CargoResult < Vec < PackageIdSpec > > {
113
- let specs = match * self {
113
+ let specs = match self {
114
114
Packages :: All => ws
115
115
. members ( )
116
116
. map ( Package :: package_id)
117
117
. map ( PackageIdSpec :: from_package_id)
118
118
. collect ( ) ,
119
- Packages :: OptOut ( ref opt_out) => ws
119
+ Packages :: OptOut ( opt_out) => ws
120
120
. members ( )
121
+ . filter ( |pkg| !opt_out. iter ( ) . any ( |name| pkg. name ( ) . as_str ( ) == name) )
121
122
. map ( Package :: package_id)
122
123
. map ( PackageIdSpec :: from_package_id)
123
- . filter ( |p| opt_out. iter ( ) . position ( |x| * x == p. name ( ) ) . is_none ( ) )
124
124
. collect ( ) ,
125
- Packages :: Packages ( ref packages) if packages. is_empty ( ) => {
125
+ Packages :: Packages ( packages) if packages. is_empty ( ) => {
126
126
vec ! [ PackageIdSpec :: from_package_id( ws. current( ) ?. package_id( ) ) ]
127
127
}
128
- Packages :: Packages ( ref packages) => packages
128
+ Packages :: Packages ( packages) => packages
129
129
. iter ( )
130
130
. map ( |p| PackageIdSpec :: parse ( p) )
131
131
. collect :: < CargoResult < Vec < _ > > > ( ) ?,
@@ -152,11 +152,11 @@ impl Packages {
152
152
let packages: Vec < _ > = match self {
153
153
Packages :: Default => ws. default_members ( ) . collect ( ) ,
154
154
Packages :: All => ws. members ( ) . collect ( ) ,
155
- Packages :: OptOut ( ref opt_out) => ws
155
+ Packages :: OptOut ( opt_out) => ws
156
156
. members ( )
157
157
. filter ( |pkg| !opt_out. iter ( ) . any ( |name| pkg. name ( ) . as_str ( ) == name) )
158
158
. collect ( ) ,
159
- Packages :: Packages ( ref pkgs ) => pkgs
159
+ Packages :: Packages ( packages ) => packages
160
160
. iter ( )
161
161
. map ( |name| {
162
162
ws. members ( )
0 commit comments