Skip to content

Rollup of 8 pull requests#158268

Merged
rust-bors[bot] merged 19 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-gqPk01p
Jun 22, 2026
Merged

Rollup of 8 pull requests#158268
rust-bors[bot] merged 19 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-gqPk01p

Conversation

@JonathanBrouwer

@JonathanBrouwer JonathanBrouwer commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

View all comments

Successful merges:

r? @ghost

Create a similar rollup

aDotInTheVoid and others added 19 commits May 31, 2026 15:58
This is motivated by cargo-semver-checks wanting to work on the standard
library, but that requires being able to filter out breaking changes to
unstable items, so it can only flag breaking changes to stable items.
This in turn is motivated by
https://www.github.com/rust-lang/rust/issues/153486.
For s390x the vector registers are now stable. That they need the target feature is already part of the ERROR assertion
On wasm the crate metadata ends up in a custom section. It is not
possible to refer to create symbols inside a custom section, so
attempting to export it during linking will result in a linker error.
This keeps the target spec flag to deny compiling rust dylibs for wasm,
but may theoretically allow compiling wasm rust dylibs with a custom
target spec. It will help with wasm proc-macros. And in the future we
can try to flip the only-cdylib option to false on wasm.
…=Mark-Simulacrum

Fix linking for wasm with crate metadata included

On wasm the crate metadata ends up in a custom section. It is not possible to refer to create symbols inside a custom section, so attempting to export it during linking will result in a linker error. This keeps the target spec flag to deny compiling rust dylibs for wasm, but may theoretically allow compiling wasm rust dylibs with a custom target spec. It will help with wasm proc-macros. And in the future we can try to flip the only-cdylib option to false on wasm.

Extracted out of rust-lang#157709, but also helps with rust-lang#157590.

r? @Mark-Simulacrum
…-recovery, r=JonathanBrouwer

Avoid `&raw` recovery ICE after trailing comma

Fixes rust-lang#157950

This is a follow up to rust-lang#157888.

For `&raw x,)`, recovery first skips `x`, then consumes the trailing comma. The old condition then fell through to `parse_token_tree()` when the next token was `)`, which causes an ICE.
…efactoring, r=petrochenkov

Refactor `proc_macro_decls_static`

During experiments in rust-lang#158024 I've noticed that we iterate over all `hir_free_items` and find `RustcProcMacroDecls` on each of them for rewrite of a single `Option` which is the result of the query.

In this PR:

- The seach for `RustcProcMacroDecls` attribute is moved into `hir_crate_items` and result is cached in `ModuleItems`, now we do not find `RustcProcMacroDecls` for each free item, we stop when it is found,
- ~`self.crate_collector` is replaced with generic const `CRATE_COLLECTOR`, maybe will give perf. improvements.~

r? @petrochenkov
rustdoc: Avoid ICE on unevaluated `type const` projections in array lengths

`clean_middle_ty` used `normalize_erasing_regions` when rendering array lengths, which panics on unevaluatable associated const projections such as `<T as Trait>::ASSOC` under mGCA.

Fixes rust-lang#158155
…mments, r=camelid

update `asm_experimental_reg` comments

Trivial bit of cleanup.

For s390x the vector registers are now stable, so `asm_experimental_reg` is no longer needed. That they need the target feature is already part of the ERROR assertion.

In the unstable book the title was incorrect.
…oc-json, r=GuillaumeGomez

Include `Item::stability` info in rustdoc JSON.

Include `Item::stability` info in rustdoc JSON, to enable tools like `cargo-semver-checks` to compute stability information and (eventually, soon™️) be used to catch accidental breaking changes in the Rust standard library (cc @Amanieu).

Successor to rust-lang#154603 by @aDotInTheVoid, building directly on top of its commit.

Differences relative to that PR:
- Added `since` information for stable items.
- `Stability` is now boxed to ensure a smaller bump in `Item` size. Most non-built-in crates won't have stability information, so minimizing that memory use is material for them.
- We have well-defined stability semantics for items, optimizing for consistency with how existing JSON users already must perform reachability and `#[doc(hidden)]` analysis, instead of how rustdoc HTML presentation works. Note the detailed inline comment about this.
- Tests and docs, which the original PR noted needed to be added.

Other flavors of stability, such as const stability or default-body stability, are left as future work.

r? @GuillaumeGomez

**AI disclosure:** This PR is the product of a combination of manual work and AI tools. I secured approval in advance from the designated reviewer. I stand behind the quality of the code I'm submitting, and I vouch it's as good or better compared to if I had written every line by my own hand.
Use an unexpanded span for actually written down opt out params

I'm trying to land the components of rust-lang#158122 individually now (and fixing the bugs in the process).

TLDR: we didn't use the span of `?Sized` for generating other default bounds of the sized hierarchy, causing in funky diagnostics, this PR fixes that
…davidtwco

Change compiler leads in triagebot.toml

r? @davidtwco
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Jun 22, 2026
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Jun 22, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors

rust-bors Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3809a10 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 Jun 22, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors retry

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

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Jun 22, 2026
…uwer

Rollup of 8 pull requests

Successful merges:

 - #158242 (Fix linking for wasm with crate metadata included)
 - #157978 (Avoid `&raw` recovery ICE after trailing comma)
 - #158119 (Refactor `proc_macro_decls_static`)
 - #158171 (rustdoc: Avoid ICE on unevaluated `type const` projections in array lengths)
 - #158172 (update `asm_experimental_reg` comments)
 - #158230 (Include `Item::stability` info in rustdoc JSON.)
 - #158258 (Use an unexpanded span for actually written down opt out params)
 - #158262 (Change compiler leads in triagebot.toml)
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
  RUST_BACKTRACE: 1
  TOOLSTATE_PUBLISH: 1
##[endgroup]
    Updating crates.io index
error: failed to get `askama_derive` as a dependency of package `askama_macros v0.16.0`
    ... which satisfies dependency `askama_macros = "=0.16.0"` of package `askama v0.16.0`
    ... which satisfies dependency `askama = "^0.16.0"` of package `citool v0.1.0 (/home/runner/work/rust/rust/src/ci/citool)`

Caused by:
  failed to load source for dependency `askama_derive`

Caused by:
  unable to update registry `crates-io`

Caused by:
  download of as/ka/askama_derive failed

Caused by:
  curl failed

Caused by:

@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 22, 2026
@rust-bors

rust-bors Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

💔 Test for f3d2eee failed: CI. Failed job:

@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors retry

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

This comment has been minimized.

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
  TOOLSTATE_PUBLISH: 1
##[endgroup]
    Updating crates.io index
error: failed to get `adler2` as a dependency of package `miniz_oxide v0.8.8`
    ... which satisfies dependency `miniz_oxide = "^0.8.5"` of package `flate2 v1.1.9`
    ... which satisfies dependency `flate2 = "^1.1.9"` of package `citool v0.1.0 (/home/runner/work/rust/rust/src/ci/citool)`

Caused by:
  failed to load source for dependency `adler2`

Caused by:
  unable to update registry `crates-io`

Caused by:
  download of ad/le/adler2 failed

Caused by:
  curl failed

Caused by:

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
  IMAGE: x86_64-gnu-aux
##[endgroup]
    Updating crates.io index
error: failed to get `adler2` as a dependency of package `miniz_oxide v0.8.8`
    ... which satisfies dependency `miniz_oxide = "^0.8.5"` of package `flate2 v1.1.9`
    ... which satisfies dependency `flate2 = "^1.1.9"` of package `citool v0.1.0 (/home/runner/work/rust/rust/src/ci/citool)`

Caused by:
  failed to load source for dependency `adler2`

Caused by:
  unable to update registry `crates-io`

Caused by:
  download of ad/le/adler2 failed

Caused by:
  curl failed

Caused by:

@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors treeopen

@rust-bors

rust-bors Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Tree is now open for merging.

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

rust-bors Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 16m 47s
Pushing 4429659 to main...

@rust-bors rust-bors Bot merged commit 4429659 into rust-lang:main Jun 22, 2026
14 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jun 22, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#157978 Avoid &raw recovery ICE after trailing comma 99b72fd86048b70b6d7f5753629f146af07559db (link)
#158119 Refactor proc_macro_decls_static 1ee560356ecca7edad461850cc190e2c72f6c21c (link)
#158171 rustdoc: Avoid ICE on unevaluated type const projections … a791266897e36403c0dc980508cd67103ad2e358 (link)
#158172 update asm_experimental_reg comments 6b5909dfc6e4969365de1875131440b55338f69e (link)
#158230 Include Item::stability info in rustdoc JSON. c41d43e1674487c18b5e1921b843229c4ccef0fc (link)
#158242 Fix linking for wasm with crate metadata included 0630b11cc8b0a5dc573e58c5b149095a0ff5b4f1 (link)
#158258 Use an unexpanded span for actually written down opt out pa… 9d9ac91729c4e5ae72070bb33f757050e7c7f536 (link)
#158262 Change compiler leads in triagebot.toml d831c66a914bf6c0ab9bc0df42e43116fb307da5 (link)

previous master: cddcbec198

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
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 cddcbec (parent) -> 4429659 (this PR)

Test differences

Show 183 test diffs

Stage 1

  • [rustdoc-html] tests/rustdoc-html/type-const-associated-const-no-body.rs: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/associated_items.rs: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/impls.rs: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/item_kinds.rs: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/members.rs: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/modules.rs: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/reexports.rs: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/stable.rs: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/unmarked.rs: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/unstable.rs: [missing] -> pass (J0)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/unstable_crate.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/type-const-associated-const-no-body.rs: pass -> [missing] (J0)
  • [ui (polonius)] tests/ui/parser/recover/raw-no-const-mut-trailing-comma.rs: [missing] -> pass (J3)
  • [ui] tests/ui/parser/recover/raw-no-const-mut-trailing-comma.rs: [missing] -> pass (J4)

Stage 2

  • [rustdoc-html] tests/rustdoc-html/type-const-associated-const-no-body.rs: [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/associated_items.rs: [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/impls.rs: [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/item_kinds.rs: [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/members.rs: [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/modules.rs: [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/reexports.rs: [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/stable.rs: [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/unmarked.rs: [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/unstable.rs: [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/stability/unstable_crate.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/type-const-associated-const-no-body.rs: pass -> [missing] (J1)
  • [ui] tests/ui/parser/recover/raw-no-const-mut-trailing-comma.rs: [missing] -> pass (J2)

Additionally, 156 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 4429659e4745016bd3f26a4a421843edc7fbc422 --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. test-various: 1h 9m -> 2h 2m (+74.4%)
  2. x86_64-msvc-ext3: 1h 15m -> 1h 48m (+43.4%)
  3. x86_64-gnu-miri: 1h 8m -> 1h 32m (+35.6%)
  4. x86_64-gnu-llvm-22-1: 1h 6m -> 43m 56s (-34.0%)
  5. x86_64-gnu-llvm-22-2: 1h 13m -> 1h 36m (+30.7%)
  6. x86_64-gnu-aux: 2h 6m -> 2h 34m (+22.6%)
  7. dist-various-2: 44m 51s -> 35m 14s (-21.4%)
  8. dist-x86_64-llvm-mingw: 1h 56m -> 1h 31m (-21.4%)
  9. x86_64-gnu-tools: 57m 42s -> 45m 45s (-20.7%)
  10. dist-various-1: 1h 14m -> 59m 38s (-20.3%)
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

Finished benchmarking commit (4429659): 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.2%, -0.2%] 6
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -2.5%, secondary -3.1%)

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.5% [1.5%, 3.4%] 2
Improvements ✅
(primary)
-2.5% [-3.0%, -2.1%] 2
Improvements ✅
(secondary)
-5.9% [-9.0%, -2.8%] 4
All ❌✅ (primary) -2.5% [-3.0%, -2.1%] 2

Cycles

Results (primary 2.2%, secondary 2.8%)

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

mean range count
Regressions ❌
(primary)
2.2% [1.8%, 2.7%] 2
Regressions ❌
(secondary)
3.5% [1.8%, 5.4%] 11
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.9% [-4.9%, -4.9%] 1
All ❌✅ (primary) 2.2% [1.8%, 2.7%] 2

Binary size

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

Bootstrap: 505.379s -> 504.341s (-0.21%)
Artifact size: 353.06 MiB -> 353.08 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 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.