Skip to content

chore: Update annotate-snippets to 0.12.15#154914

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Muscraft:update-annotate-snippets
Apr 8, 2026
Merged

chore: Update annotate-snippets to 0.12.15#154914
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Muscraft:update-annotate-snippets

Conversation

@Muscraft
Copy link
Copy Markdown
Member

@Muscraft Muscraft commented Apr 6, 2026 •
edited by rustbot
Loading

This PR updates annotate-snippets to 0.12.15, which includes a fix for #154258, as well as a number of other fixes over 0.12.10.

fixes #154258

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 6, 2026

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rustbot rustbot added 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Apr 6, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 6, 2026

r? @davidtwco

rustbot has assigned @davidtwco.
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 69 candidates
  • Random selection from 11 candidates

@jieyouxu jieyouxu self-assigned this Apr 7, 2026
jieyouxu
jieyouxu approved these changes Apr 7, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@jieyouxu jieyouxu left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

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

Thanks!

Marking this as rollup=never because I expect that some diagnostic ICEs might get fixed by this bump (for easier bisection).
r? me @bors r+ rollup=never

View changes since this review

compiler/rustc_errors/Cargo.toml
Copy link
Copy Markdown
Member

@jieyouxu jieyouxu Apr 7, 2026

Choose a reason for hiding this comment

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

Reproducing annotate-snippet's changelog:

[0.12.15] - 2026-04-06

Fixed

  • Source highlighting no longer misaligns when source contains zero-width or multi-width characters #400

[0.12.14] - 2026-04-04

Fixed

  • Don't trim middle of spans smaller than padding + margin
  • Properly handle replacement length mismatches
  • Account for "gutter" width when trimming middle of long spans
  • Account for left trim when trimming middle of long spans

[0.12.13] - 2026-03-04

Fixed

  • Correctly handle tabs on the first and last lines of multiline Patch #373 and #380

[0.12.12] - 2026-02-18

Added

  • Add no_std support #365

[0.12.11] - 2026-01-29

Fixed

  • Fix Unicode highlight alignment in patches #357

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 7, 2026

📌 Commit 63ed113 has been approved by jieyouxu

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 Apr 7, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-bors rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 8, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 8, 2026

☀️ Test successful - CI
Approved by: jieyouxu
Duration: 3h 13m 29s
Pushing e26dedc to main...

@rust-bors rust-bors bot merged commit e26dedc into rust-lang:main Apr 8, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Apr 8, 2026
@Muscraft Muscraft deleted the update-annotate-snippets branch April 8, 2026 13:30
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 8, 2026

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing c753cef (parent) -> e26dedc (this PR)

Test differences

Show 2 test diffs

2 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard e26dedca9db45f1a397885b9a454701153f6d436 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. aarch64-apple: 4h 44m -> 2h 37m (-44.5%)
  2. dist-x86_64-apple: 2h 27m -> 1h 49m (-25.8%)
  3. test-various: 1h 50m -> 2h 15m (+22.3%)
  4. x86_64-gnu-llvm-21-2: 1h 27m -> 1h 42m (+17.2%)
  5. pr-check-2: 39m 27s -> 45m 1s (+14.1%)
  6. dist-armhf-linux: 1h 25m -> 1h 36m (+13.0%)
  7. i686-msvc-1: 2h 43m -> 3h 3m (+12.5%)
  8. tidy: 2m 44s -> 3m 3s (+11.4%)
  9. dist-powerpc64-linux-musl: 1h 29m -> 1h 39m (+11.0%)
  10. dist-powerpc64-linux-gnu: 1h 31m -> 1h 40m (+10.7%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Copy Markdown
Collaborator

rust-timer commented Apr 8, 2026

Finished benchmarking commit (e26dedc): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (primary 2.5%, secondary 0.9%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)		 2.5% [2.5%, 2.5%] 1
Regressions ❌
(secondary)		 0.9% [0.9%, 0.9%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.5% [2.5%, 2.5%] 1

Cycles

This perf run didn't have relevant results for this metric.

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 489.76s -> 488.355s (-0.29%)
Artifact size: 395.37 MiB -> 395.37 MiB (0.00%)

@Muscraft Muscraft mentioned this pull request Apr 9, 2026
Merged
github-merge-queue bot pushed a commit to rust-lang/cargo that referenced this pull request Apr 9, 2026
@weihanglo
chore: Update annotate-snippets to 0.12.15 (#16859)
4498a58 
[I recently updated](rust-lang/rust#154914) the
version of `annotate-snippts` that `rust` uses as the newer version
contained a fix for a panic that a few `rust` users encountered. Given
that was the case, I figured that it would be a good idea to update the
version `cargo` uses as well, on the off chance that it could affect
anyone here.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels

merged-by-bors This PR was explicitly merged by bors. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.96.0

Development

Successfully merging this pull request may close these issues.

[ICE]: StyledBuffer::replace panics with --diagnostic-width <= 10

5 participants

@Muscraft @rustbot @rust-timer @jieyouxu @davidtwco