Skip to content

Commit d347908

Browse files
committed
Cleanup Packages to packages
1 parent 55895e7 commit d347908

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/cargo/ops/cargo_compile.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,22 @@ impl Packages {
110110
}
111111

112112
pub fn to_package_id_specs(&self, ws: &Workspace<'_>) -> CargoResult<Vec<PackageIdSpec>> {
113-
let specs = match *self {
113+
let specs = match self {
114114
Packages::All => ws
115115
.members()
116116
.map(Package::package_id)
117117
.map(PackageIdSpec::from_package_id)
118118
.collect(),
119-
Packages::OptOut(ref opt_out) => ws
119+
Packages::OptOut(opt_out) => ws
120120
.members()
121+
.filter(|pkg| !opt_out.iter().any(|name| pkg.name().as_str() == name))
121122
.map(Package::package_id)
122123
.map(PackageIdSpec::from_package_id)
123-
.filter(|p| opt_out.iter().position(|x| *x == p.name()).is_none())
124124
.collect(),
125-
Packages::Packages(ref packages) if packages.is_empty() => {
125+
Packages::Packages(packages) if packages.is_empty() => {
126126
vec![PackageIdSpec::from_package_id(ws.current()?.package_id())]
127127
}
128-
Packages::Packages(ref packages) => packages
128+
Packages::Packages(packages) => packages
129129
.iter()
130130
.map(|p| PackageIdSpec::parse(p))
131131
.collect::<CargoResult<Vec<_>>>()?,
@@ -152,11 +152,11 @@ impl Packages {
152152
let packages: Vec<_> = match self {
153153
Packages::Default => ws.default_members().collect(),
154154
Packages::All => ws.members().collect(),
155-
Packages::OptOut(ref opt_out) => ws
155+
Packages::OptOut(opt_out) => ws
156156
.members()
157157
.filter(|pkg| !opt_out.iter().any(|name| pkg.name().as_str() == name))
158158
.collect(),
159-
Packages::Packages(ref pkgs) => pkgs
159+
Packages::Packages(packages) => packages
160160
.iter()
161161
.map(|name| {
162162
ws.members()

0 commit comments

Comments
 (0)