Skip to content

Rollup of 2 pull requests#153541

Merged
rust-bors[bot] merged 4 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-XmqEf4Q
Mar 7, 2026
Merged

Rollup of 2 pull requests#153541
rust-bors[bot] merged 4 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-XmqEf4Q

Conversation

@JonathanBrouwer
Copy link
Contributor

@JonathanBrouwer JonathanBrouwer commented Mar 7, 2026

Successful merges:

r? @ghost

Create a similar rollup

aerooneqq and others added 4 commits March 6, 2026 16:02
@aerooneqq
Replace Box<[TraitCandidate]> with &'hir [TraitCandidate<'hir>]
dc31c15
@obi1kenobi
Fix incorrect rustdoc JSON representation of #[doc(test(..))] attrs.
d3149ca
@JonathanBrouwer
Rollup merge of rust-lang#153494 - aerooneqq:boxed-trait-candidates-t…
10f2c48 
…o-hir-arena, r=petrochenkov

Replace Box<[TraitCandidate]> with &'hir [TraitCandidate<'hir>]

This PR allocates trait candidates on HIR arena and replaces `remove` with `get` in `ResolverAstLowering`. First step for rust-lang#153489.

r? @petrochenkov
@JonathanBrouwer
Rollup merge of rust-lang#153465 - obi1kenobi:pg/trailing-bracket-fix…
1f12441 
…, r=aDotInTheVoid

Fix incorrect rustdoc JSON representation of `#[doc(test(..))]` attrs.

Attributes like `#[doc(test(attr(deny(rust_2018_idioms))))]` are accidentally emitted without the final `]`.

Also, the `#[doc(test(no_crate_inject))]` attribute is mistakenly emitted as `#[doc(no_crate_inject)]` — note the missing `test` wrapper.

This PR adds the missing `]` and fixes the `no_crate_inject`, and adds regression tests for both.

Thanks to the folks working on `tonic` and `pyo3` for reporting a `cargo-semver-checks` crash on Rust 1.94 in their projects, which led me to finding this bug. Refs:
- https://github.com/hyperium/tonic/actions/runs/22732044107/job/65957306230?pr=2536
- https://github.com/PyO3/pyo3/actions/runs/22745106403/job/65967167797
- obi1kenobi/cargo-semver-checks#1590

r? @aDotInTheVoid
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Mar 7, 2026
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend 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 Mar 7, 2026
@JonathanBrouwer
Copy link
Contributor Author

JonathanBrouwer commented Mar 7, 2026

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 7, 2026

📌 Commit 1f12441 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 Mar 7, 2026
@rust-bors rust-bors bot mentioned this pull request Mar 7, 2026
Merged
@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 Mar 7, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 7, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 25m 5s
Pushing e3d66fe to main...

@rust-bors rust-bors bot merged commit e3d66fe into rust-lang:main Mar 7, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 7, 2026
@rust-timer
Copy link
Collaborator

rust-timer commented Mar 7, 2026

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#153465 Fix incorrect rustdoc JSON representation of `#[doc(test(..… af6b4198ea97a9243dffd4633b657d1605a5ec6d (link)
#153494 Replace Box<[TraitCandidate]> with &'hir [TraitCandidate<'h… d10bed33493fbd5bafefd3a09adb4691cbad8ec7 (link)

previous master: 085c58f2c0

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 Mar 7, 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 085c58f (parent) -> e3d66fe (this PR)

Test differences

Show 18 test diffs

Stage 1

  • [rustdoc-json] tests/rustdoc-json/attrs/no_crate_inject.rs: [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/trailing_bracket.rs: [missing] -> pass (J1)

Stage 2

  • [rustdoc-json] tests/rustdoc-json/attrs/no_crate_inject.rs: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/trailing_bracket.rs: [missing] -> pass (J0)

Additionally, 14 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 e3d66fe39ae70380fa2365c008e2927479114844 --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 37m -> 1h 58m (+21.4%)
  2. i686-gnu-2: 1h 28m -> 1h 42m (+15.2%)
  3. i686-gnu-1: 2h 6m -> 2h 25m (+15.0%)
  4. x86_64-gnu-aux: 1h 58m -> 2h 14m (+13.5%)
  5. x86_64-gnu-llvm-20-2: 1h 45m -> 1h 32m (-12.2%)
  6. dist-aarch64-apple: 1h 57m -> 2h 11m (+11.9%)
  7. pr-check-1: 28m 35s -> 25m 11s (-11.9%)
  8. pr-check-2: 35m 57s -> 40m 5s (+11.5%)
  9. aarch64-msvc-1: 2h 8m -> 1h 55m (-9.6%)
  10. x86_64-gnu-distcheck: 2h 11m -> 2h 23m (+9.1%)
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 Mar 7, 2026
Draft
@rust-timer
Copy link
Collaborator

rust-timer commented Mar 7, 2026

Finished benchmarking commit (e3d66fe): 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.2% [-0.3%, -0.1%] 9
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -0.1%, secondary -1.7%)

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

mean range count
Regressions ❌
(primary)		 1.3% [1.3%, 1.3%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.9% [-1.0%, -0.8%] 2
Improvements ✅
(secondary)		 -1.7% [-1.7%, -1.7%] 1
All ❌✅ (primary) -0.1% [-1.0%, 1.3%] 3

Cycles

Results (primary 2.1%)

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

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

Binary size

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

Bootstrap: 478.289s -> 478.012s (-0.06%)
Artifact size: 395.07 MiB -> 397.02 MiB (0.49%)

@JonathanBrouwer
Copy link
Contributor Author

JonathanBrouwer commented Mar 7, 2026

Caused by #153494 (comment)

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-rustdoc-json Area: Rustdoc JSON backend 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. 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.

5 participants

@JonathanBrouwer @rust-timer @rustbot @aerooneqq @obi1kenobi