Skip to content

Conversation

@JonathanBrouwer
Copy link
Contributor

@JonathanBrouwer JonathanBrouwer commented Jan 1, 2026

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

estebank and others added 10 commits December 25, 2025 20:56
Adds a test for nested proc-macro calls where the inner macro returns an
empty TokenStream.
This previously caused an ICE in rustc_resolve.
Since they became alumni and don't want to receive pings anymore.
…e-cargo}` to `compiler`

So that I don't become the only automatically-assigned reviewer due to
weighting reasons.
So that there's `n > 1` selection pool in case one of the eligible
reviewers go off rotation.
…ethercote

Tweak wording of diff marker diagnostic
…thercote

test and document that `proc_macro::Ident` is NFC-normalized

Previously, this was not tested at all and the test suite would pass even when replacing the `normalize_and_validate_ident` implementation with a `panic!`.
Add regression test for issue rust-lang#99173

Close rust-lang#99173.

Adds a regression test for rust-lang#99173, which was an ICE that occurred when a proc-macro generated code that invoked another proc-macro returning an empty `TokenStream`.
Update triagebot config for `compiler-errors`, `tests/{run-make,run-make-cargo}` and `fallback` adhoc_group

- Commit 1: Updates triagebot entries for `compiler-errors` (context: rust-lang/team#2205)
- Commit 2: Expand `tests/{run-make,run-make-cargo}` reviewer pool to the `compiler` `adhoc_group` instead of just me for weighting reasons, so I don't become the sole assigned reviewer even when I'm off rotation.
- Commit 3: Add myself to `fallback` adhoc_group so there's `n > 1` pool there, in case one of the reviewers go off rotation.
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. rollup A PR which is a rollup labels Jan 1, 2026
@JonathanBrouwer
Copy link
Contributor Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jan 1, 2026

📌 Commit ecee483 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@bors bors 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 Jan 1, 2026
@bors
Copy link
Collaborator

bors commented Jan 1, 2026

⌛ Testing commit ecee483 with merge 056908d...

@bors
Copy link
Collaborator

bors commented Jan 2, 2026

☀️ Test successful - checks-actions
Approved by: JonathanBrouwer
Pushing 056908d to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 2, 2026
@bors bors merged commit 056908d into rust-lang:main Jan 2, 2026
12 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Jan 2, 2026
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#150382 Tweak wording of diff marker diagnostic e4f7ccb33e30ef508b54a20532c817dd7b9019ee (link)
#150431 test and document that proc_macro::Ident is NFC-normalized 74ec29ae5ee34bc61bdce74373f3e804e77db233 (link)
#150504 Add regression test for issue #99173 00b05013dfac9c4cf3fcabca5de6556be6b13618 (link)
#150568 Update triagebot config for compiler-errors, `tests/{run-… 1b7815c21af807e57c5f21472b09e155c40420e4 (link)

previous master: fcd630976c

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
Contributor

github-actions bot commented Jan 2, 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 fcd6309 (parent) -> 056908d (this PR)

Test differences

Show 4 test diffs

Stage 1

  • [ui] tests/ui/proc-macro/nested-empty-proc-macro.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/proc-macro/nested-empty-proc-macro.rs: [missing] -> pass (J0)

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

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 056908d7f44ab901ae6573cf2d9c1d8b166ed1c5 --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: 4766.1s -> 3695.7s (-22.5%)
  2. dist-x86_64-apple: 8245.2s -> 7119.5s (-13.7%)
  3. dist-x86_64-illumos: 5624.7s -> 6309.5s (+12.2%)
  4. x86_64-gnu-distcheck: 7285.7s -> 8115.9s (+11.4%)
  5. x86_64-gnu-debug: 7356.8s -> 6605.1s (-10.2%)
  6. pr-check-1: 1629.0s -> 1781.7s (+9.4%)
  7. dist-aarch64-llvm-mingw: 6306.9s -> 5736.9s (-9.0%)
  8. dist-aarch64-apple: 7006.4s -> 6375.7s (-9.0%)
  9. x86_64-rust-for-linux: 2702.0s -> 2940.6s (+8.8%)
  10. x86_64-mingw-1: 9963.5s -> 9211.6s (-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-timer
Copy link
Collaborator

Finished benchmarking commit (056908d): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

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

Max RSS (memory usage)

Results (secondary -2.9%)

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)
-2.9% [-2.9%, -2.9%] 1
All ❌✅ (primary) - - 0

Cycles

Results (primary -10.5%, secondary -16.5%)

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)
-10.5% [-13.3%, -4.2%] 7
Improvements ✅
(secondary)
-16.5% [-26.8%, -3.6%] 11
All ❌✅ (primary) -10.5% [-13.3%, -4.2%] 7

Binary size

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

Bootstrap: 475.254s -> 474.6s (-0.14%)
Artifact size: 390.85 MiB -> 390.83 MiB (-0.01%)

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

Labels

A-meta Area: Issues & PRs about the rust-lang/rust repository itself merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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

Development

Successfully merging this pull request may close these issues.

8 participants