chore: Update annotate-snippets to 0.12.15 by Muscraft · Pull Request #154914 · rust-lang/rust

Muscraft · 2026-04-06T22:05:24Z

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 · 2026-04-06T22:05:29Z

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 · 2026-04-06T22:05:31Z

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

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

jieyouxu · 2026-04-07T08:08:32Z

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 · 2026-04-07T08:09:24Z

📌 Commit 63ed113 has been approved by jieyouxu

It is now in the queue for this repository.

rust-bors · 2026-04-08T13:29:35Z

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

github-actions · 2026-04-08T13:32:32Z

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

aarch64-apple: 4h 44m -> 2h 37m (-44.5%)
dist-x86_64-apple: 2h 27m -> 1h 49m (-25.8%)
test-various: 1h 50m -> 2h 15m (+22.3%)
x86_64-gnu-llvm-21-2: 1h 27m -> 1h 42m (+17.2%)
pr-check-2: 39m 27s -> 45m 1s (+14.1%)
dist-armhf-linux: 1h 25m -> 1h 36m (+13.0%)
i686-msvc-1: 2h 43m -> 3h 3m (+12.5%)
tidy: 2m 44s -> 3m 3s (+11.4%)
dist-powerpc64-linux-musl: 1h 29m -> 1h 39m (+11.0%)
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 · 2026-04-08T14:09:47Z

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%)

[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.

…ring All five tasks now coordinate in main.rs::run_async. 75 tests pass, clippy clean. horizon-firehose is a runnable end-to-end binary after this phase — not deployed, but operational. Task coordination: - Global shutdown via single watch::Sender<bool> observed only by ws_reader - Downstream tasks (decoder, router, publisher, persister) exit via input channel closing — drain-first ordering from §3 naturally - Task panic detection via &mut JoinHandle<T> in tokio::select! (JoinHandle is Unpin, so it's a Future; polling &mut doesn't consume the handle, so we can still join() in the cascade) Shutdown cascade under 30s tokio::time::timeout budget: decoder drain → router drain → publisher drain → cursors.persist_all() → persister exit. Overrun returns ShutdownBudgetExceeded, exits non-zero. Panic handling: first JoinHandle to resolve with error wins, coordinator logs ERROR with task name, flips global shutdown, runs cascade, returns TaskFailure for orchestrator restart. Startup from saved cursors: Cursors::load_from_backend reads existing cursors per configured relay; ws_reader appends ?cursor=N to relay URL on connect. Best-effort — Redis hiccup at startup means resume from live tip (matches §3 "no prior cursor" policy). Redis startup resilience: RedisBackend::connect_with_retry runs indefinite exponential backoff but observes shutdown signal. SIGINT during Redis-down startup exits cleanly instead of hanging. Scope call: TLS extra CA file validation only — proto-blue-ws uses tokio_tungstenite::connect_async without a ClientConfig hook, so we can't actually load custom CAs into the TLS stack yet. Fast-fail on bad path, WARN log that the bundle is inert. Tracked upstream at dollspace-gay/proto-blue#4. Design cleanup: Cursors is now the sole source of truth for per-relay position. Phase 4 left a ghost cursor field on RelayState that was never written after the refactor — removed. rustc 1.95.0 ICE workaround: added .cargo/config.toml pinning --diagnostic-width=120 because dead_code warnings trigger a StyledBuffer::replace panic when --diagnostic-width auto-detects as 0 under WSL-from-Windows. Upstream fix landed but not in 1.95.0. References rust-lang/rust#154914. Tests added (pipeline_main_test.rs): - end_to_end_pipeline_delivers_event_to_backend: real fixture frame through full pipeline, lands in fake backend - shutdown_cascade_finalises_cursor_within_budget: replays §3 sequence, asserts each stage under 30s, final cursor at base64url key - task_panic_is_detected_via_join_handle_select: verifies the supervisor pattern - pipeline_initializes_even_when_backend_is_failing_then_shuts_down: FailMode::FailNext(10_000) stuck retry + SIGINT exits clean with cursor unadvanced Not done: structured metrics (phase 6), Dockerfile (phase 9), production deployment (phase 11).

The rustc 1.95 ICE that `.cargo/config.toml` was pinning around — StyledBuffer::replace panicking in annotate-snippets when --diagnostic-width auto-detected as 0 while emitting dead_code warnings — no longer fires. The upstream fix (rust-lang/rust#154914) appears to have propagated to the stable channel we're building on. Confirmed via cargo check + cargo test (119 passing) without the --diagnostic-width=120 pin. Workaround no longer needed. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

chore: Update annotate-snippets to 0.12.15

63ed113

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 assigned davidtwco Apr 6, 2026

jieyouxu self-assigned this Apr 7, 2026

jieyouxu approved these changes Apr 7, 2026

View reviewed changes

rustbot unassigned davidtwco Apr 7, 2026

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

This comment has been minimized.

Sign in to view

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 Bot merged commit e26dedc into rust-lang:main Apr 8, 2026
12 checks passed

rustbot added this to the 1.96.0 milestone Apr 8, 2026

Muscraft deleted the update-annotate-snippets branch April 8, 2026 13:30

Muscraft mentioned this pull request Apr 9, 2026

chore: Update annotate-snippets to 0.12.15 rust-lang/cargo#16859

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore: Update annotate-snippets to 0.12.15#154914

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

Muscraft commented Apr 6, 2026 •

edited by rustbot

Loading

Uh oh!

rustbot commented Apr 6, 2026

Uh oh!

rustbot commented Apr 6, 2026

Uh oh!

jieyouxu left a comment •

edited by rustbot

Loading

Uh oh!

jieyouxu Apr 7, 2026

Uh oh!

rust-bors Bot commented Apr 7, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Apr 8, 2026

Uh oh!

Uh oh!

github-actions Bot commented Apr 8, 2026

Uh oh!

rust-timer commented Apr 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

Muscraft commented Apr 6, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Apr 6, 2026

Uh oh!

rustbot commented Apr 6, 2026

Uh oh!

jieyouxu left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu Apr 7, 2026

Choose a reason for hiding this comment

[0.12.15] - 2026-04-06

Fixed

[0.12.14] - 2026-04-04

Fixed

[0.12.13] - 2026-03-04

Fixed

[0.12.12] - 2026-02-18

Added

[0.12.11] - 2026-01-29

Fixed

Uh oh!

rust-bors Bot commented Apr 7, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Apr 8, 2026

Uh oh!

Uh oh!

github-actions Bot commented Apr 8, 2026

Test differences

Job duration changes

Uh oh!

rust-timer commented Apr 8, 2026

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Muscraft commented Apr 6, 2026 •

edited by rustbot

Loading

jieyouxu left a comment •

edited by rustbot

Loading