From 49e2f84eddc0171ebb8e64ccacb926344a5ba412 Mon Sep 17 00:00:00 2001 From: Farid Huliiev Date: Wed, 30 Apr 2025 19:56:31 +0200 Subject: [PATCH] fix: output a blank line between items --- src/cargo/ops/cargo_add/mod.rs | 22 +++++++++++++------ .../stderr.term.svg | 14 +++++++----- .../stderr.term.svg | 10 ++++++--- .../features_unknown/stderr.term.svg | 10 +++++---- .../stderr.term.svg | 8 ++++--- .../unknown_inherited_feature/stderr.term.svg | 18 +++++++++------ 6 files changed, 53 insertions(+), 29 deletions(-) diff --git a/src/cargo/ops/cargo_add/mod.rs b/src/cargo/ops/cargo_add/mod.rs index d872e2f00..b60d3fb12 100644 --- a/src/cargo/ops/cargo_add/mod.rs +++ b/src/cargo/ops/cargo_add/mod.rs @@ -159,19 +159,19 @@ pub fn add(workspace: &Workspace<'_>, options: &AddOptions<'_>) -> CargoResult<( activated.retain(|f| !unknown_features.contains(f)); let mut message = format!( - "unrecognized feature{} for crate {}: {}\n", + "unrecognized feature{} for crate {}: {}", if unknown_features.len() == 1 { "" } else { "s" }, dep.name, unknown_features.iter().format(", "), ); if activated.is_empty() && deactivated.is_empty() { - write!(message, "no features available for crate {}", dep.name)?; + write!(message, "\n\nno features available for crate {}", dep.name)?; } else { if !deactivated.is_empty() { if deactivated.len() <= MAX_FEATURE_PRINTS { - writeln!( + write!( message, - "disabled features:\n {}", + "\n\ndisabled features:\n {}", deactivated .iter() .map(|s| s.to_string()) @@ -184,14 +184,18 @@ pub fn add(workspace: &Workspace<'_>, options: &AddOptions<'_>) -> CargoResult<( .format("\n ") )?; } else { - writeln!(message, "{} disabled features available", deactivated.len())?; + write!( + message, + "\n\n{} disabled features available", + deactivated.len() + )?; } } if !activated.is_empty() { if deactivated.len() + activated.len() <= MAX_FEATURE_PRINTS { writeln!( message, - "enabled features:\n {}", + "\n\nenabled features:\n {}", activated .iter() .map(|s| s.to_string()) @@ -204,7 +208,11 @@ pub fn add(workspace: &Workspace<'_>, options: &AddOptions<'_>) -> CargoResult<( .format("\n ") )?; } else { - writeln!(message, "{} enabled features available", activated.len())?; + writeln!( + message, + "\n\n{} enabled features available", + activated.len() + )?; } } } diff --git a/tests/testsuite/cargo_add/features_error_activated_over_limit/stderr.term.svg b/tests/testsuite/cargo_add/features_error_activated_over_limit/stderr.term.svg index 21b4d42f5..cdd2606b8 100644 --- a/tests/testsuite/cargo_add/features_error_activated_over_limit/stderr.term.svg +++ b/tests/testsuite/cargo_add/features_error_activated_over_limit/stderr.term.svg @@ -1,4 +1,4 @@ - +