Skip to content

Commit 3824d83

Browse files
author
Yihai Lin
committed
refactor: Pull out the filter logic.
1 parent 8b9dc21 commit 3824d83

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/cargo/ops/cargo_compile/unit_generator.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -247,15 +247,15 @@ impl<'a> UnitGenerator<'a, '_> {
247247
mode: CompileMode,
248248
) -> CargoResult<Vec<Proposal<'a>>> {
249249
let is_glob = is_glob_pattern(target_name);
250-
let proposals = if is_glob {
251-
let pattern = build_glob(target_name)?;
252-
let filter = |t: &Target| is_expected_kind(t) && pattern.matches(t.name());
253-
self.filter_targets(filter, true, mode)
254-
} else {
255-
let filter = |t: &Target| t.name() == target_name && is_expected_kind(t);
256-
self.filter_targets(filter, true, mode)
250+
let pattern = build_glob(target_name)?;
251+
let filter = |t: &Target| {
252+
if is_glob {
253+
is_expected_kind(t) && pattern.matches(t.name())
254+
} else {
255+
is_expected_kind(t) && t.name() == target_name
256+
}
257257
};
258-
258+
let proposals = self.filter_targets(filter, true, mode);
259259
if proposals.is_empty() {
260260
let targets = self
261261
.packages

0 commit comments

Comments
 (0)