Skip to content

Rollup of 3 pull requests#154877

Merged
rust-bors[bot] merged 7 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-rbarkwZ
Apr 6, 2026
Merged

Rollup of 3 pull requests#154877
rust-bors[bot] merged 7 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-rbarkwZ

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

@JonathanBrouwer JonathanBrouwer commented Apr 6, 2026

Successful merges:

r? @ghost

Create a similar rollup

folkertdev and others added 7 commits March 29, 2026 18:31
@folkertdev
emit error on #[track_caller] with extern fn
3ce8cfb 
such a function implicitly uses `extern "C"
@mejrs
Force all diagnostic attr formatting through eval.
4c97a92
@mejrs
Rename OnUnimplementedNote to CustomDiagnostic
7791ac7
@scrabsha
attr parsing: make sure we pass the right target when errors could be…
6be1404 
… emitted
@JonathanBrouwer
Rollup merge of rust-lang#154554 - folkertdev:track-caller-extern-mis…
3c24746 
…sing-abi, r=TaKO8Ki

emit error on `#[track_caller]` with `extern fn`

fixes rust-lang#154541

A `extern fn` implicitly uses `extern "C"`, but needs some custom logic to emit an error when used in conjunction with `#[track_caller]` which is only allowed on `extern "Rust"` functions. This issue was introduced in rust-lang#153920.
@JonathanBrouwer
Rollup merge of rust-lang#154858 - mejrs:diagnostic_eval, r=JonathanB…
cb3b8ff 
…rouwer

Change api of formatting diagnostic attribute strings.

As of recently a lot of people are creating new diagnostic attributes, but skipping its methods and doing things like `directive.message.as_ref().map(|e| e.1.format(&args)),` instead, but that skips the `tracing` instrumentation of diagnostic attribute formatting. The first commit forces people to use the right method for that.

The name `OnUnimplementedNote` also hasn't been accurate for some time.
@JonathanBrouwer
Rollup merge of rust-lang#154876 - scrabsha:push-ymvvtywqttlq, r=Jona…
2973fd5 
…thanBrouwer

attr parsing: make sure we pass the right target when errors could be emitted
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Apr 6, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) 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 Apr 6, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

JonathanBrouwer commented Apr 6, 2026

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 6, 2026

📌 Commit 2973fd5 has been approved by JonathanBrouwer

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 6, 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 6, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 6, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 23m 42s
Pushing 906ca7f to main...

@rust-bors rust-bors bot merged commit 906ca7f into rust-lang:main Apr 6, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Apr 6, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

rust-timer commented Apr 6, 2026

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#154554 emit error on #[track_caller] with extern fn 37c0eabee834d410e71a8ce62ce624759ee75070 (link)
#154858 Change api of formatting diagnostic attribute strings. 181113b5bd1c96ab761e28e0fafe69286a45714b (link)
#154876 attr parsing: make sure we pass the right target when error… 6d74718f1201e8fc4a7081c60590cc952a669eb5 (link)

previous master: 5a0d572cd1

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 6, 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 5a0d572 (parent) -> 906ca7f (this PR)

Test differences

Show 19 test diffs

19 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 906ca7ff5e1f01cdf59388574b4822365bffabea --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. dist-apple-various: 1h 28m -> 1h 58m (+33.6%)
  2. i686-msvc-2: 1h 41m -> 2h 11m (+28.7%)
  3. dist-x86_64-apple: 2h 12m -> 1h 44m (-21.1%)
  4. dist-aarch64-apple: 2h 3m -> 1h 45m (-14.5%)
  5. x86_64-gnu-tools: 57m 41s -> 1h 4m (+11.5%)
  6. dist-x86_64-musl: 1h 59m -> 2h 10m (+9.2%)
  7. dist-riscv64-linux: 1h 29m -> 1h 21m (-8.4%)
  8. x86_64-gnu-llvm-22-2: 1h 37m -> 1h 45m (+8.2%)
  9. pr-check-1: 33m 29s -> 36m 10s (+8.0%)
  10. i686-msvc-1: 3h -> 3h 13m (+7.5%)
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-bors rust-bors bot mentioned this pull request Apr 6, 2026
Open
@rust-timer
Copy link
Copy Markdown
Collaborator

rust-timer commented Apr 6, 2026

Finished benchmarking commit (906ca7f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary -3.7%)

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

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

Cycles

Results (primary -2.6%, secondary -6.3%)

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

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 2.6% [2.6%, 2.6%] 1
Improvements ✅
(primary)		 -2.6% [-2.6%, -2.6%] 1
Improvements ✅
(secondary)		 -10.8% [-12.1%, -9.4%] 2
All ❌✅ (primary) -2.6% [-2.6%, -2.6%] 1

Binary size

Results (primary 0.0%, secondary 0.0%)

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

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

Bootstrap: 488.486s -> 487.434s (-0.22%)
Artifact size: 395.12 MiB -> 395.29 MiB (0.04%)

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

Reviewers

No reviews

Assignees

No one assigned

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler 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.

6 participants

@JonathanBrouwer @rust-timer @rustbot @folkertdev @mejrs @scrabsha