Skip to content

Add support for annotate_snippets::snippet::AnnotationKind::Visible - #162874

Merged
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom
estebank:annotate-snippets-context
Sep 17, 2026
Merged

Add support for annotate_snippets::snippet::AnnotationKind::Visible#162874
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom
estebank:annotate-snippets-context

Conversation

@estebank

@estebank estebank commented Sep 16, 2026

Copy link
Copy Markdown
Contributor

annotate-snippets-rs supports pointing at Spans without an underline. Start using that feature in rustc. We currently use secondary span labels with no text to point at context that should appear in the diagnostic, but that are merely context. This change removes the underline from some Spans while retaining the code being rendered, reducing the number of lines being printed to the terminal marginally.

CC @Muscraft

@estebank
Add support for annotate_snippets::snippet::AnnotationKind::Visible
d38f60b 
`annotate-snippets-rs` supports pointing at `Span`s without an underline. Start using that feature in `rustc`. We currently use secondary span labels with no text to point at context that should appear in the diagnostic, but that are merely context.
@estebank
Use span_context in more places
5981733
@rustbot

rustbot commented Sep 16, 2026

Copy link
Copy Markdown
Collaborator

rustc_error_messages was changed

cc @TaKO8Ki

rustc_errors::annotate_snippet_emitter_writer was changed

cc @Muscraft

Some changes occurred in match checking

cc @Nadrieril

@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 16, 2026
@rustbot

rustbot commented Sep 16, 2026

Copy link
Copy Markdown
Collaborator

r? @oli-obk

rustbot has assigned @oli-obk.
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

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: compiler
  • compiler expanded to 76 candidates
  • Random selection from 21 candidates

oli-obk
oli-obk approved these changes Sep 17, 2026
View reviewed changes

@oli-obk oli-obk left a comment •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh nice! yea we should use this a lot more. spanning an entire async block or other body is really noisy, and usually we just want it shown

View changes since this review

@oli-obk

oli-obk commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@rust-bors

rust-bors Bot commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 591e081 has been approved by oli-obk

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 17, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Sep 17, 2026
@JonathanBrouwer
Rollup merge of rust-lang#162874 - estebank:annotate-snippets-context…
47bbfd5 
…, r=oli-obk

Add support for `annotate_snippets::snippet::AnnotationKind::Visible`

`annotate-snippets-rs` supports pointing at `Span`s without an underline. Start using that feature in `rustc`. We currently use secondary span labels with no text to point at context that should appear in the diagnostic, but that are merely context. This change removes the underline from some `Span`s while retaining the code being rendered, reducing the number of lines being printed to the terminal marginally.

CC @Muscraft
@JonathanBrouwer JonathanBrouwer mentioned this pull request Sep 17, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Sep 17, 2026
@bors
Auto merge of #162893 - JonathanBrouwer:rollup-CZf8Dq9, r=JonathanBro…
a5deafd 
…uwer

Rollup of 24 pull requests

Successful merges:

 - #161596 (coretests: Add more pattern tests.)
 - #162177 (Properly implement the gpu-kernel ABI for amdgpu)
 - #162411 (Make Receiver `#[rustc_dyn_incompatible_trait]`)
 - #162760 (yeet alias new_from_def_id)
 - #162796 (libtest: do not early exit from test runners)
 - #162844 (Add loan reachability traces to polonius MIR dumps)
 - #162876 (Move operations out of `rustc_middle::query::job`)
 - #160108 (Stabilize `windows_process_extensions_main_thread_handle`)
 - #160212 (traits: Fix rigid alias liveness matching)
 - #160544 (Stabilize `feature(trim_prefix_suffix)` (`{str, [T], Path}::trim_prefix` and `{str, [T]}::trim_suffix`))
 - #161305 (Use the entire type of a dropped local to compute variance (edge direction) for Polonius alpha)
 - #161838 (tests: accept LLVM 24 optimization in this test)
 - #162312 (core: Rewrite docs for try_as_dyn)
 - #162785 (Avoid creating overlapping assignments in MatchBranchSimplification)
 - #162805 (Add `must_use` lint to `ExitCode`)
 - #162825 (core: Add examples for `debug_closure_helpers`)
 - #162841 (enable asm tests for xtensa targets)
 - #162842 (reintroduce check RibKind::ConstParamTy did in direct consts)
 - #162845 (mgca: fix issue with mismatched array valtree/valtree tys)
 - #162856 (Stabilize CommandExt::show_window)
 - #162865 (Complex conjugate, negation and default)
 - #162874 (Add support for `annotate_snippets::snippet::AnnotationKind::Visible`)
 - #162881 (Simplify the macro for forwarding Decoder methods )
 - #162888 (Fix a typo on the Armv7-R platform docs page)
@JonathanBrouwer JonathanBrouwer mentioned this pull request Sep 17, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Sep 17, 2026
@bors
Auto merge of #162907 - JonathanBrouwer:rollup-ZYkL9DX, r=JonathanBro…
76af58f 
…uwer

Rollup of 23 pull requests

Successful merges:

 - #161596 (coretests: Add more pattern tests.)
 - #162411 (Make Receiver `#[rustc_dyn_incompatible_trait]`)
 - #162760 (yeet alias new_from_def_id)
 - #162796 (libtest: do not early exit from test runners)
 - #162844 (Add loan reachability traces to polonius MIR dumps)
 - #162876 (Move operations out of `rustc_middle::query::job`)
 - #160108 (Stabilize `windows_process_extensions_main_thread_handle`)
 - #160212 (traits: Fix rigid alias liveness matching)
 - #160544 (Stabilize `feature(trim_prefix_suffix)` (`{str, [T], Path}::trim_prefix` and `{str, [T]}::trim_suffix`))
 - #161305 (Use the entire type of a dropped local to compute variance (edge direction) for Polonius alpha)
 - #161838 (tests: accept LLVM 24 optimization in this test)
 - #162312 (core: Rewrite docs for try_as_dyn)
 - #162785 (Avoid creating overlapping assignments in MatchBranchSimplification)
 - #162805 (Add `must_use` lint to `ExitCode`)
 - #162825 (core: Add examples for `debug_closure_helpers`)
 - #162841 (enable asm tests for xtensa targets)
 - #162842 (reintroduce check RibKind::ConstParamTy did in direct consts)
 - #162845 (mgca: fix issue with mismatched array valtree/valtree tys)
 - #162856 (Stabilize CommandExt::show_window)
 - #162865 (Complex conjugate, negation and default)
 - #162874 (Add support for `annotate_snippets::snippet::AnnotationKind::Visible`)
 - #162881 (Simplify the macro for forwarding Decoder methods )
 - #162888 (Fix a typo on the Armv7-R platform docs page)
@rust-bors
rust-bors Bot merged commit 0dc3ef9 into rust-lang:main Sep 17, 2026
13 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Sep 17, 2026
rust-bors Bot pushed a commit that referenced this pull request Sep 17, 2026
@bors
Unrolled build for #162874 in rollup 162907
e2eef99 
Rollup merge of #162874 - estebank:annotate-snippets-context, r=oli-obk

Add support for `annotate_snippets::snippet::AnnotationKind::Visible`

`annotate-snippets-rs` supports pointing at `Span`s without an underline. Start using that feature in `rustc`. We currently use secondary span labels with no text to point at context that should appear in the diagnostic, but that are merely context. This change removes the underline from some `Span`s while retaining the code being rendered, reducing the number of lines being printed to the terminal marginally.

CC @Muscraft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obk oli-obk oli-obk approved these changes

Assignees

@oli-obk oli-obk

Labels

A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.100.0

Development

Successfully merging this pull request may close these issues.

3 participants

@estebank @rustbot @oli-obk