fix(cli): Adjust messages to match rustc #15928

epage · 2025-09-04T21:38:22Z

What does this PR try to resolve?

This is also prep for #15917, #15922

Changes:

note changes from Cyan to Bright Green
- cargo info had to be changed because the header and context colors became the same
Switch to Bright colors which is usually redundant with Bold but that is theme dependent
- warning only changes to Bright on Windows which is to work around a shell issue on some Windows versions
- except for PLACEHOLDER to tell it apart from LITERAL
the : in note: is no longer bolded to match rustc

How to test and review this PR?

Notes

While annotate-snippets does not have a style for every one of our styles, I updated our manual styles to be similar to annotate snippets.

For annotate snippets color definitions, see https://github.com/rust-lang/annotate-snippets-rs/blob/d38b08b81d7d574369ecfd30124195a970b37fd3/src/renderer/mod.rs#L41-L78

Fixes rust-lang#12740

rustbot · 2025-09-04T21:38:26Z

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

weihanglo

Thanks!

tests/testsuite/cargo/help/stdout.term.svg

epage · 2025-09-05T00:19:31Z

tests/testsuite/cargo_info/specify_version_within_ws_and_match_with_lockfile/stderr.term.svg

I am a little disappointed that our note color is the same as our headers. However, unsure if we have the plethora of options to do much about it wholly on our end

Maybe we should make sure this is merged after beta branch so we have extra time to tweak things (e.g. turning some notes into helps)

epage · 2025-09-05T00:22:23Z

tests/testsuite/cargo_add/default_features/stderr.term.svg

Aside: strange that the deleted version had Adding in cyan despite files had it being green and the code isn't conditional

Really strange. It happened not only once, so probably some bug in term_svg in snapbox?

cargo/tests/testsuite/cargo_add/default_features/stderr.term.svg

Line 31 in 3b379fc

<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>

I have produced it, but not sure why. All Adding status with a (available:) extra messages seem to have the issue.

weihanglo

Looks good for matching rustc style. Thank you!

weihanglo · 2025-09-08T03:46:56Z

tests/testsuite/cargo_add/default_features/stderr.term.svg

Really strange. It happened not only once, so probably some bug in term_svg in snapbox?

cargo/tests/testsuite/cargo_add/default_features/stderr.term.svg

Line 31 in 3b379fc

<tspan x="10px" y="100px"><tspan class="fg-cyan bold"> Adding</tspan><tspan> my-package2 v0.4.1+my-package </tspan><tspan class="fg-yellow bold">(available: v99999.0.0+my-package)</tspan>

I have produced it, but not sure why. All Adding status with a (available:) extra messages seem to have the issue.

weihanglo · 2025-09-08T04:06:13Z

tests/testsuite/cargo_info/within_ws/stderr.term.svg

A bit prefer to the previous version. note is more outstanding.

Update cargo submodule 10 commits in 761c4658d0079d607e6d33cf0c060e61a617cad3..98402ac7a41dd0f564d3e56d58180d325d0417a0 2025-09-04 01:25:01 +0000 to 2025-09-09 20:19:39 +0000 - fix(flock): check if they are marked unsupported in libstd (rust-lang/cargo#15941) - test(manifest): Fix test output order (rust-lang/cargo#15940) - refactor(shell): Simplify some code (rust-lang/cargo#15937) - fix(manifest): Report script manifest errors for the right line number (rust-lang/cargo#15927) - refactor: replace flock with std flock (rust-lang/cargo#15935) - fix(cli): Adjust messages to match rustc (rust-lang/cargo#15928) - fix: Switch from --nocapture to --no-capture (rust-lang/cargo#15930) - Render individual compilation sections in `--timings` pipeline graph (rust-lang/cargo#15923) - test(credential): Switch more expected results to snapshots (rust-lang/cargo#15929) - refactor(cli): Pull out error chain iteration (rust-lang/cargo#15926) r? ghost

### What does this PR try to resolve? #15928 removed the fix from #13488 which breaks rust-lang/rust. This fixes that and makes the test less brittle for the future. ### How to test and review this PR?

Update cargo submodule 13 commits in 761c4658d0079d607e6d33cf0c060e61a617cad3..24bb93c388fb8c211a37986539f24a819dc669d3 2025-09-04 01:25:01 +0000 to 2025-09-10 23:16:07 +0000 - Bump miow to 0.60.1 (rust-lang/cargo#15950) - test(help): Ensure consistent behavior regardless of rustup use (rust-lang/cargo#15949) - docs(changelog): Clarify how manifest paths are used (rust-lang/cargo#15946) - fix(flock): check if they are marked unsupported in libstd (rust-lang/cargo#15941) - test(manifest): Fix test output order (rust-lang/cargo#15940) - refactor(shell): Simplify some code (rust-lang/cargo#15937) - fix(manifest): Report script manifest errors for the right line number (rust-lang/cargo#15927) - refactor: replace flock with std flock (rust-lang/cargo#15935) - fix(cli): Adjust messages to match rustc (rust-lang/cargo#15928) - fix: Switch from --nocapture to --no-capture (rust-lang/cargo#15930) - Render individual compilation sections in `--timings` pipeline graph (rust-lang/cargo#15923) - test(credential): Switch more expected results to snapshots (rust-lang/cargo#15929) - refactor(cli): Pull out error chain iteration (rust-lang/cargo#15926)

PR rust-lang#15928 made `Checking` and `Building` the same style because the transient state is `note:` and rust-lang#15928 made `note:~ the same as our regular headers. This switches the transient state to `help:` until we can further explore color choices with rustc. See also https://rust-lang.zulipchat.com/#narrow/channel/246057-t-cargo/topic/colors.20removed.20in.201.2E91.20.28current.20beta.29.3F/near/541900531

### What does this PR try to resolve? PR #15928 made `Checking` and `Building` the same style because the transient state is `note:` and #15928 made `note:~ the same as our regular headers. This switches the transient state to `help:` until we can further explore color choices with rustc. ### Notes See also https://rust-lang.zulipchat.com/#narrow/channel/246057-t-cargo/topic/colors.20removed.20in.201.2E91.20.28current.20beta.29.3F/near/541900531

PR rust-lang#15928 made `Checking` and `Building` the same style because the transient state is `note:` and rust-lang#15928 made `note:~ the same as our regular headers. This switches the transient state to `help:` until we can further explore color choices with rustc. See also https://rust-lang.zulipchat.com/#narrow/channel/246057-t-cargo/topic/colors.20removed.20in.201.2E91.20.28current.20beta.29.3F/near/541900531

### What does this PR try to resolve? PR rust-lang#15928 made `Checking` and `Building` the same style because the transient state is `note:` and rust-lang#15928 made `note:~ the same as our regular headers. This switches the transient state to `help:` until we can further explore color choices with rustc. ### Notes See also https://rust-lang.zulipchat.com/#narrow/channel/246057-t-cargo/topic/colors.20removed.20in.201.2E91.20.28current.20beta.29.3F/near/541900531

epage added 2 commits September 4, 2025 16:32

chore: Update annotate-snippets

c6ebabd

fix(cli): Adjust terminal styles to match rustc

7d6d673

Fixes rust-lang#12740

rustbot assigned weihanglo Sep 4, 2025

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 4, 2025

epage mentioned this pull request Sep 4, 2025

WIP: fix(shell): Switch to annotate snippets for warnings #15917

Draft

epage force-pushed the annotate-consistent branch from 00766f9 to ce7397a Compare September 4, 2025 21:43

weihanglo approved these changes Sep 4, 2025

View reviewed changes

epage force-pushed the annotate-consistent branch 2 times, most recently from 9815a5e to f09e09c Compare September 4, 2025 23:59

rustbot added A-interacts-with-crates.io Area: interaction with registries Command-info labels Sep 5, 2025

epage commented Sep 5, 2025

View reviewed changes

tests/testsuite/cargo/help/stdout.term.svg Show resolved Hide resolved

epage force-pushed the annotate-consistent branch from f09e09c to dafdb3f Compare September 5, 2025 00:10

epage commented Sep 5, 2025

View reviewed changes

epage force-pushed the annotate-consistent branch 2 times, most recently from 74ece70 to 46d3e9b Compare September 5, 2025 14:04

fix(shell): Don't bold the colon after error/warn/note

eac1ad1

rustbot added the A-console-output Area: Terminal output, colors, progress bar, etc. label Sep 5, 2025

epage changed the title ~~fix(cli): Adjust terminal styles to match rustc~~ fix(cli): Adjust messages to match rustc Sep 5, 2025

epage force-pushed the annotate-consistent branch 4 times, most recently from f41116e to eac1ad1 Compare September 5, 2025 19:51

weihanglo approved these changes Sep 8, 2025

View reviewed changes

weihanglo added this pull request to the merge queue Sep 8, 2025

Merged via the queue into rust-lang:master with commit 3ceb2cb Sep 8, 2025
27 checks passed

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 8, 2025

epage deleted the annotate-consistent branch September 8, 2025 11:40

weihanglo mentioned this pull request Sep 9, 2025

Update cargo submodule rust-lang/rust#146386

Merged

epage mentioned this pull request Sep 10, 2025

Migrate to annotate-snippets #15944

Open

12 tasks

epage mentioned this pull request Sep 10, 2025

test(help): Ensure consistent behavior regardless of rustup use #15949

Merged

rustbot added this to the 1.91.0 milestone Sep 11, 2025

epage mentioned this pull request Sep 29, 2025

fix(shell): Use a distinct style for transient status #16019

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(cli): Adjust messages to match rustc #15928

fix(cli): Adjust messages to match rustc #15928

Uh oh!

epage commented Sep 4, 2025 •

edited

Loading

Uh oh!

rustbot commented Sep 4, 2025

Uh oh!

weihanglo left a comment

Uh oh!

Uh oh!

epage Sep 5, 2025

Uh oh!

epage Sep 5, 2025

Uh oh!

epage Sep 5, 2025

Uh oh!

weihanglo Sep 8, 2025

Uh oh!

weihanglo left a comment

Uh oh!

weihanglo Sep 8, 2025

Uh oh!

weihanglo Sep 8, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

fix(cli): Adjust messages to match rustc #15928

fix(cli): Adjust messages to match rustc #15928

Uh oh!

Conversation

epage commented Sep 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR try to resolve?

How to test and review this PR?

Notes

Uh oh!

rustbot commented Sep 4, 2025

Uh oh!

weihanglo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

epage Sep 5, 2025

Choose a reason for hiding this comment

Uh oh!

epage Sep 5, 2025

Choose a reason for hiding this comment

Uh oh!

epage Sep 5, 2025

Choose a reason for hiding this comment

Uh oh!

weihanglo Sep 8, 2025

Choose a reason for hiding this comment

Uh oh!

weihanglo left a comment

Choose a reason for hiding this comment

Uh oh!

weihanglo Sep 8, 2025

Choose a reason for hiding this comment

Uh oh!

weihanglo Sep 8, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

epage commented Sep 4, 2025 •

edited

Loading