Skip to content

Commit 86dcd23

Browse files
committed
refactor(compile): De-duplicate error generation
1 parent 05775e5 commit 86dcd23

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

src/cargo/ops/cargo_compile/unit_generator.rs

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -307,24 +307,16 @@ impl<'a> UnitGenerator<'a, '_> {
307307
let named = if is_glob { "matches pattern" } else { "named" };
308308

309309
let mut msg = String::new();
310-
if !suggestion.is_empty() {
311-
write!(
312-
msg,
313-
"no {target_desc} target {named} `{target_name}` in {unmatched_packages}{suggestion}",
314-
)?;
310+
write!(
311+
msg,
312+
"no {target_desc} target {named} `{target_name}` in {unmatched_packages}{suggestion}",
313+
)?;
314+
if !targets_elsewhere.is_empty() {
315315
append_targets_elsewhere(&mut msg)?;
316-
} else {
317-
write!(
318-
msg,
319-
"no {target_desc} target {named} `{target_name}` in {unmatched_packages}",
320-
)?;
321-
322-
append_targets_elsewhere(&mut msg)?;
323-
if !targets.is_empty() && targets_elsewhere.is_empty() {
324-
write!(msg, "\nAvailable {} targets:", target_desc)?;
325-
for target in targets {
326-
write!(msg, "\n {}", target.name())?;
327-
}
316+
} else if suggestion.is_empty() && !targets.is_empty() {
317+
write!(msg, "\nAvailable {} targets:", target_desc)?;
318+
for target in targets {
319+
write!(msg, "\n {}", target.name())?;
328320
}
329321
}
330322
anyhow::bail!(msg);

0 commit comments

Comments
 (0)