Skip to content

Commit 27b5ac7

Browse files
committed
refactor(add): Rely on anstream for cleaner code
1 parent b227fe1 commit 27b5ac7

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

src/cargo/ops/cargo_add/mod.rs

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -947,41 +947,36 @@ fn print_dep_table_msg(shell: &mut Shell, dep: &DependencyUI) -> CargoResult<()>
947947
return Ok(());
948948
}
949949

950+
let stderr = shell.err();
951+
let good = style::GOOD.render();
952+
let error = style::ERROR.render();
953+
let reset = anstyle::Reset.render();
954+
950955
let (activated, deactivated) = dep.features();
951956
if !activated.is_empty() || !deactivated.is_empty() {
952957
let prefix = format!("{:>13}", " ");
953958
let suffix = format_features_version_suffix(&dep);
954959

955-
shell.write_stderr(format_args!("{prefix}Features{suffix}:\n"), &style::NOP)?;
960+
writeln!(stderr, "{prefix}Features{suffix}:")?;
956961

957962
const MAX_FEATURE_PRINTS: usize = 30;
958963
let total_activated = activated.len();
959964
let total_deactivated = deactivated.len();
960965

961966
if total_activated <= MAX_FEATURE_PRINTS {
962967
for feat in activated {
963-
shell.write_stderr(&prefix, &style::NOP)?;
964-
shell.write_stderr('+', &style::GOOD)?;
965-
shell.write_stderr(format_args!(" {feat}\n"), &style::NOP)?;
968+
writeln!(stderr, "{prefix}{good}+{reset} {feat}")?;
966969
}
967970
} else {
968-
shell.write_stderr(
969-
format_args!("{prefix}{total_activated} activated features\n"),
970-
&style::NOP,
971-
)?;
971+
writeln!(stderr, "{prefix}{total_activated} activated features")?;
972972
}
973973

974974
if total_activated + total_deactivated <= MAX_FEATURE_PRINTS {
975975
for feat in deactivated {
976-
shell.write_stderr(&prefix, &style::NOP)?;
977-
shell.write_stderr('-', &style::ERROR)?;
978-
shell.write_stderr(format_args!(" {feat}\n"), &style::NOP)?;
976+
writeln!(stderr, "{prefix}{error}-{reset} {feat}")?;
979977
}
980978
} else {
981-
shell.write_stderr(
982-
format_args!("{prefix}{total_deactivated} deactivated features\n"),
983-
&style::NOP,
984-
)?;
979+
writeln!(stderr, "{prefix}{total_deactivated} deactivated features")?;
985980
}
986981
}
987982

0 commit comments

Comments
 (0)