From eac1ad1cd3c06445205f20712d60dff559888602 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Fri, 5 Sep 2025 09:40:24 -0500 Subject: [PATCH] fix(shell): Don't bold the colon after error/warn/note --- src/cargo/core/shell.rs | 4 +--- .../stderr.term.svg | 2 +- .../add_no_vendored_package_with_vendor/stderr.term.svg | 2 +- tests/testsuite/cargo_add/add_toolchain/stderr.term.svg | 2 +- .../cargo_add/deprecated_default_features/stderr.term.svg | 2 +- .../testsuite/cargo_add/deprecated_section/stderr.term.svg | 2 +- tests/testsuite/cargo_add/dry_run/stderr.term.svg | 2 +- tests/testsuite/cargo_add/empty_dep_name/stderr.term.svg | 2 +- .../cargo_add/feature_suggestion_multiple/stderr.term.svg | 2 +- .../cargo_add/feature_suggestion_none/stderr.term.svg | 2 +- .../cargo_add/feature_suggestion_single/stderr.term.svg | 2 +- .../features_error_activated_over_limit/stderr.term.svg | 2 +- .../features_error_deactivated_over_limit/stderr.term.svg | 2 +- tests/testsuite/cargo_add/features_unknown/stderr.term.svg | 2 +- .../cargo_add/features_unknown_no_features/stderr.term.svg | 2 +- .../cargo_add/git_conflicts_namever/stderr.term.svg | 2 +- .../cargo_add/git_inferred_name_multiple/stderr.term.svg | 4 ++-- tests/testsuite/cargo_add/git_registry/stderr.term.svg | 4 ++-- tests/testsuite/cargo_add/invalid_git_name/stderr.term.svg | 4 ++-- .../invalid_key_inherit_dependency/stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- .../invalid_key_rename_inherit_dependency/stderr.term.svg | 2 +- .../cargo_add/invalid_name_external/stderr.term.svg | 2 +- tests/testsuite/cargo_add/invalid_path/stderr.term.svg | 4 ++-- tests/testsuite/cargo_add/invalid_path_name/stderr.term.svg | 4 ++-- tests/testsuite/cargo_add/invalid_path_self/stderr.term.svg | 2 +- tests/testsuite/cargo_add/invalid_vers/stderr.term.svg | 2 +- tests/testsuite/cargo_add/locked_changed/stderr.term.svg | 4 ++-- .../cargo_add/missing_at_in_crate_spec/stderr.term.svg | 2 +- .../multiple_conflicts_with_features/stderr.term.svg | 2 +- .../multiple_conflicts_with_rename/stderr.term.svg | 2 +- .../testsuite/cargo_add/normalize_name_git/stderr.term.svg | 4 ++-- .../testsuite/cargo_add/normalize_name_path/stderr.term.svg | 4 ++-- .../cargo_add/normalize_name_path_existing/stderr.term.svg | 2 +- .../cargo_add/normalize_name_registry/stderr.term.svg | 4 ++-- .../normalize_name_registry_existing/stderr.term.svg | 2 +- .../normalize_name_registry_yanked/stderr.term.svg | 2 +- .../cargo_add/normalize_name_workspace_dep/stderr.term.svg | 2 +- .../testsuite/cargo_add/offline_empty_cache/stderr.term.svg | 2 +- .../cargo_add/path_base_missing_base_path/stderr.term.svg | 2 +- .../testsuite/cargo_add/path_base_unstable/stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- .../cargo_add/prefixed_v_in_version/stderr.term.svg | 2 +- .../cargo_add/rust_version_incompatible/stderr.term.svg | 2 +- .../testsuite/cargo_add/rust_version_older/stderr.term.svg | 2 +- .../testsuite/cargo_add/rustc_incompatible/stderr.term.svg | 2 +- tests/testsuite/cargo_add/rustc_latest/stderr.term.svg | 2 +- tests/testsuite/cargo_add/rustc_older/stderr.term.svg | 2 +- tests/testsuite/cargo_add/script_bare/stderr.term.svg | 4 ++-- .../cargo_add/script_frontmatter_empty/stderr.term.svg | 4 ++-- tests/testsuite/cargo_add/script_shebang/stderr.term.svg | 4 ++-- .../cargo_add/unknown_inherited_feature/stderr.term.svg | 2 +- tests/testsuite/cargo_info/not_found/stderr.term.svg | 4 ++-- .../specify_empty_version_with_url/stderr.term.svg | 2 +- .../stderr.term.svg | 4 ++-- .../stderr.term.svg | 2 +- .../transitive_dependency_within_ws/direct1-stderr.term.svg | 2 +- .../transitive_dependency_within_ws/direct2-stderr.term.svg | 2 +- .../transitive1-stderr.term.svg | 2 +- .../transitive2-stderr.term.svg | 2 +- .../transitive_dependency_within_ws/ws-stderr.term.svg | 2 +- .../cargo_info/with_frozen_outside_ws/stderr.term.svg | 2 +- .../cargo_info/with_frozen_within_ws/stderr.term.svg | 4 ++-- .../cargo_info/with_locked_outside_ws/stderr.term.svg | 2 +- .../cargo_info/with_locked_within_ws/stderr.term.svg | 4 ++-- tests/testsuite/cargo_info/with_offline/stderr.term.svg | 4 ++-- tests/testsuite/cargo_info/within_ws/stderr.term.svg | 2 +- .../cargo_info/within_ws_without_lockfile/stderr.term.svg | 2 +- .../without_requiring_registry_auth/stderr.term.svg | 2 +- tests/testsuite/cargo_init/auto_git/stderr.term.svg | 2 +- .../cargo_init/bin_already_exists_explicit/stderr.term.svg | 2 +- .../bin_already_exists_explicit_nosrc/stderr.term.svg | 2 +- .../cargo_init/bin_already_exists_implicit/stderr.term.svg | 2 +- .../bin_already_exists_implicit_namenosrc/stderr.term.svg | 2 +- .../bin_already_exists_implicit_namesrc/stderr.term.svg | 2 +- .../bin_already_exists_implicit_nosrc/stderr.term.svg | 2 +- tests/testsuite/cargo_init/both_lib_and_bin/stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- .../confused_by_multiple_lib_files/stderr.term.svg | 2 +- .../creates_binary_when_both_binlib_present/stderr.term.svg | 2 +- .../stderr.term.svg | 4 ++-- .../stderr.term.svg | 4 ++-- .../cargo_init/explicit_bin_with_git/stderr.term.svg | 2 +- tests/testsuite/cargo_init/formats_source/stderr.term.svg | 2 +- .../testsuite/cargo_init/fossil_autodetect/stderr.term.svg | 2 +- tests/testsuite/cargo_init/git_autodetect/stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- .../ignores_failure_to_format_source/stderr.term.svg | 2 +- .../cargo_init/inferred_bin_with_git/stderr.term.svg | 2 +- .../cargo_init/inferred_lib_with_git/stderr.term.svg | 2 +- .../inherit_workspace_package_table/stderr.term.svg | 2 +- tests/testsuite/cargo_init/invalid_dir_name/stderr.term.svg | 2 +- .../cargo_init/lib_already_exists_nosrc/stderr.term.svg | 2 +- .../cargo_init/lib_already_exists_src/stderr.term.svg | 2 +- .../cargo_init/mercurial_autodetect/stderr.term.svg | 2 +- .../cargo_init/multibin_project_name_clash/stderr.term.svg | 2 +- tests/testsuite/cargo_init/no_filename/stderr.term.svg | 2 +- .../cargo_init/path_contains_separator/stderr.term.svg | 6 +++--- tests/testsuite/cargo_init/pijul_autodetect/stderr.term.svg | 2 +- tests/testsuite/cargo_init/reserved_name/stderr.term.svg | 2 +- tests/testsuite/cargo_init/simple_bin/stderr.term.svg | 2 +- tests/testsuite/cargo_init/simple_git/stderr.term.svg | 2 +- .../cargo_init/simple_git_ignore_exists/stderr.term.svg | 2 +- tests/testsuite/cargo_init/simple_hg/stderr.term.svg | 2 +- .../cargo_init/simple_hg_ignore_exists/stderr.term.svg | 2 +- tests/testsuite/cargo_init/simple_lib/stderr.term.svg | 2 +- tests/testsuite/cargo_init/with_argument/stderr.term.svg | 2 +- .../cargo_init/workspace_add_member/stderr.term.svg | 2 +- .../cargo_new/add_members_to_non_workspace/stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- .../add_members_to_workspace_format_sorted/stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- tests/testsuite/cargo_new/empty_name/stderr.term.svg | 2 +- .../cargo_new/ignore_current_dir_workspace/stderr.term.svg | 2 +- .../cargo_new/inherit_workspace_lints/stderr.term.svg | 2 +- .../inherit_workspace_package_table/stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- .../stderr.term.svg | 2 +- tests/testsuite/cargo_remove/dry_run/stderr.term.svg | 2 +- tests/testsuite/cargo_remove/invalid_dep/stderr.term.svg | 2 +- .../testsuite/cargo_remove/invalid_package/stderr.term.svg | 4 ++-- .../cargo_remove/invalid_package_multiple/stderr.term.svg | 2 +- .../testsuite/cargo_remove/invalid_section/stderr.term.svg | 2 +- .../cargo_remove/invalid_section_dep/stderr.term.svg | 2 +- tests/testsuite/cargo_remove/invalid_target/stderr.term.svg | 2 +- .../cargo_remove/invalid_target_dep/stderr.term.svg | 2 +- tests/testsuite/cargo_remove/script/stderr.term.svg | 4 ++-- tests/testsuite/cargo_remove/script_last/stderr.term.svg | 4 ++-- .../cargo_update/toolchain_pkgname/stderr.term.svg | 2 +- tests/testsuite/lints/inherited/stderr.term.svg | 2 +- 136 files changed, 160 insertions(+), 162 deletions(-) diff --git a/src/cargo/core/shell.rs b/src/cargo/core/shell.rs index 48c3f68dc..e62d3b280 100644 --- a/src/cargo/core/shell.rs +++ b/src/cargo/core/shell.rs @@ -457,13 +457,11 @@ impl ShellOut { style: &Style, justified: bool, ) -> CargoResult<()> { - let bold = anstyle::Style::new() | anstyle::Effects::BOLD; - let mut buffer = Vec::new(); if justified { write!(&mut buffer, "{style}{status:>12}{style:#}")?; } else { - write!(&mut buffer, "{style}{status}{style:#}{bold}:{bold:#}")?; + write!(&mut buffer, "{style}{status}{style:#}:")?; } match message { Some(message) => writeln!(buffer, " {message}")?, diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.term.svg b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.term.svg index d64931ab8..37e71bc1e 100644 --- a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.term.svg +++ b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.term.svg @@ -22,7 +22,7 @@ Updating `alternative` index - warning: translating `linked_hash_map` to `linked-hash-map` + warning: translating `linked_hash_map` to `linked-hash-map` Adding linked-hash-map v0.5.4 to dependencies diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stderr.term.svg b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stderr.term.svg index 5179199fa..13f183488 100644 --- a/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stderr.term.svg +++ b/tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stderr.term.svg @@ -18,7 +18,7 @@ - error: the crate `cbindgen` could not be found in registry index. + error: the crate `cbindgen` could not be found in registry index. diff --git a/tests/testsuite/cargo_add/add_toolchain/stderr.term.svg b/tests/testsuite/cargo_add/add_toolchain/stderr.term.svg index 8e7b25b18..d8b34aec9 100644 --- a/tests/testsuite/cargo_add/add_toolchain/stderr.term.svg +++ b/tests/testsuite/cargo_add/add_toolchain/stderr.term.svg @@ -18,7 +18,7 @@ - error: invalid character `+` in dependency name: `+nightly` + error: invalid character `+` in dependency name: `+nightly` Use `cargo +nightly add` if you meant to use the `nightly` toolchain. diff --git a/tests/testsuite/cargo_add/deprecated_default_features/stderr.term.svg b/tests/testsuite/cargo_add/deprecated_default_features/stderr.term.svg index 2ae74195b..22fa3a519 100644 --- a/tests/testsuite/cargo_add/deprecated_default_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/deprecated_default_features/stderr.term.svg @@ -18,7 +18,7 @@ - error: Use of `default_features` in `my-package` is unsupported, please switch to `default-features` + error: Use of `default_features` in `my-package` is unsupported, please switch to `default-features` diff --git a/tests/testsuite/cargo_add/deprecated_section/stderr.term.svg b/tests/testsuite/cargo_add/deprecated_section/stderr.term.svg index 43dd5cb7d..af9fbef79 100644 --- a/tests/testsuite/cargo_add/deprecated_section/stderr.term.svg +++ b/tests/testsuite/cargo_add/deprecated_section/stderr.term.svg @@ -18,7 +18,7 @@ - error: Deprecated dependency sections are unsupported: dev_dependencies, build_dependencies + error: Deprecated dependency sections are unsupported: dev_dependencies, build_dependencies diff --git a/tests/testsuite/cargo_add/dry_run/stderr.term.svg b/tests/testsuite/cargo_add/dry_run/stderr.term.svg index 11b940753..0198e3123 100644 --- a/tests/testsuite/cargo_add/dry_run/stderr.term.svg +++ b/tests/testsuite/cargo_add/dry_run/stderr.term.svg @@ -23,7 +23,7 @@ Adding my-package v99999.0.0 to dependencies - warning: aborting add due to dry run + warning: aborting add due to dry run diff --git a/tests/testsuite/cargo_add/empty_dep_name/stderr.term.svg b/tests/testsuite/cargo_add/empty_dep_name/stderr.term.svg index fd1253026..f9f7fd0a0 100644 --- a/tests/testsuite/cargo_add/empty_dep_name/stderr.term.svg +++ b/tests/testsuite/cargo_add/empty_dep_name/stderr.term.svg @@ -18,7 +18,7 @@ - error: package name cannot be empty + error: package name cannot be empty diff --git a/tests/testsuite/cargo_add/feature_suggestion_multiple/stderr.term.svg b/tests/testsuite/cargo_add/feature_suggestion_multiple/stderr.term.svg index 56914a381..86fb154b0 100644 --- a/tests/testsuite/cargo_add/feature_suggestion_multiple/stderr.term.svg +++ b/tests/testsuite/cargo_add/feature_suggestion_multiple/stderr.term.svg @@ -23,7 +23,7 @@ Adding my-package v0.1.0 to dependencies - error: unrecognized features for crate my-package: baz, feo + error: unrecognized features for crate my-package: baz, feo diff --git a/tests/testsuite/cargo_add/feature_suggestion_none/stderr.term.svg b/tests/testsuite/cargo_add/feature_suggestion_none/stderr.term.svg index 3280cbad2..06cbb8303 100644 --- a/tests/testsuite/cargo_add/feature_suggestion_none/stderr.term.svg +++ b/tests/testsuite/cargo_add/feature_suggestion_none/stderr.term.svg @@ -23,7 +23,7 @@ Adding my-package v0.1.0 to dependencies - error: unrecognized feature for crate my-package: none_existent + error: unrecognized feature for crate my-package: none_existent diff --git a/tests/testsuite/cargo_add/feature_suggestion_single/stderr.term.svg b/tests/testsuite/cargo_add/feature_suggestion_single/stderr.term.svg index bc0a06955..44c5f2c76 100644 --- a/tests/testsuite/cargo_add/feature_suggestion_single/stderr.term.svg +++ b/tests/testsuite/cargo_add/feature_suggestion_single/stderr.term.svg @@ -23,7 +23,7 @@ Adding my-package v0.1.0 to dependencies - error: unrecognized feature for crate my-package: baz + error: unrecognized feature for crate my-package: baz 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 4245cca15..0c11aa3c4 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 @@ -23,7 +23,7 @@ Adding your-face v99999.0.0 to dependencies - error: unrecognized features for crate your-face: eees100, eees101 + error: unrecognized features for crate your-face: eees100, eees101 diff --git a/tests/testsuite/cargo_add/features_error_deactivated_over_limit/stderr.term.svg b/tests/testsuite/cargo_add/features_error_deactivated_over_limit/stderr.term.svg index 6bf402b49..9cb907c31 100644 --- a/tests/testsuite/cargo_add/features_error_deactivated_over_limit/stderr.term.svg +++ b/tests/testsuite/cargo_add/features_error_deactivated_over_limit/stderr.term.svg @@ -23,7 +23,7 @@ Adding your-face v99999.0.0 to dependencies - error: unrecognized features for crate your-face: eees100, eees101 + error: unrecognized features for crate your-face: eees100, eees101 diff --git a/tests/testsuite/cargo_add/features_unknown/stderr.term.svg b/tests/testsuite/cargo_add/features_unknown/stderr.term.svg index 06bb69805..6238793cb 100644 --- a/tests/testsuite/cargo_add/features_unknown/stderr.term.svg +++ b/tests/testsuite/cargo_add/features_unknown/stderr.term.svg @@ -23,7 +23,7 @@ Adding your-face v99999.0.0 to dependencies - error: unrecognized feature for crate your-face: noze + error: unrecognized feature for crate your-face: noze diff --git a/tests/testsuite/cargo_add/features_unknown_no_features/stderr.term.svg b/tests/testsuite/cargo_add/features_unknown_no_features/stderr.term.svg index 893efb370..1a27f3dae 100644 --- a/tests/testsuite/cargo_add/features_unknown_no_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/features_unknown_no_features/stderr.term.svg @@ -23,7 +23,7 @@ Adding my-package v99999.0.0 to dependencies - error: unrecognized feature for crate my-package: noze + error: unrecognized feature for crate my-package: noze diff --git a/tests/testsuite/cargo_add/git_conflicts_namever/stderr.term.svg b/tests/testsuite/cargo_add/git_conflicts_namever/stderr.term.svg index 6811c315d..5632cffd5 100644 --- a/tests/testsuite/cargo_add/git_conflicts_namever/stderr.term.svg +++ b/tests/testsuite/cargo_add/git_conflicts_namever/stderr.term.svg @@ -18,7 +18,7 @@ - error: cannot specify a git URL (`https://github.com/dcjanus/invalid`) with a version (`0.4.3`). + error: cannot specify a git URL (`https://github.com/dcjanus/invalid`) with a version (`0.4.3`). diff --git a/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.term.svg b/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.term.svg index a2eda67ed..17392183c 100644 --- a/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.term.svg +++ b/tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.term.svg @@ -1,4 +1,4 @@ - +