Skip to content

Rollup of 7 pull requests#156305

Merged
rust-bors[bot] merged 19 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-xjiYS62
May 8, 2026
Merged

Rollup of 7 pull requests#156305
rust-bors[bot] merged 19 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-xjiYS62

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

cjgillot and others added 19 commits May 3, 2026 23:00
The code is simpler with it gone.
By removing "random number", which is no longer true. And also wrapping
the overly long lines.
To make clear some things I wasn't sure about.
All the necessary data can be taken from `SyntaxExtension` instead.
Clone only on interface boundaries with `rustc_expand`
This is consistent with our use of `widening` elsewhere.

Suggested-by: Gabriel Bjørnager Jensen <gabriel@achernar.io>
* Lint doc comments in cfg_select branches
* test with multi-line doc comment

Co-authored-by: Copilot <copilot@github.com>
* Reject outer attributes on `cfg_select` branches
* address nits and gotchas

Co-authored-by: Copilot <copilot@github.com>
* one more test

Co-authored-by: Copilot <copilot@github.com>
* avoid snapshotting and classify recovered doc comments directly
resolve: Remove `MacroData`

All the necessary data can be taken from `SyntaxExtension` instead.
Rename the unstable integer `extend` function to `widen`

This is consistent with our use of `widening` elsewhere.

Suggested-by: Gabriel Bjørnager Jensen <gabriel@achernar.io>
…ease

turn some long-deprecated -C options into errors

- `-Car` has been documented to do nothing for more than 8 years (rust-lang@691ab6c)  and causes a warning for more than a year (rust-lang#135126).
- `-Cno-stack-check` has been made a NOP and deprecated with a warning more than 9 years ago (rust-lang@c670293)
- `-Cinline-threshold` has been made a NOP and deprecated with a warning almost 2 years ago (rust-lang#124712).

With them being ignored there's always a risk someone thinks they'll do something and they don't notice the warning. I think these have been deprecated for long enough that we can turn them into hard errors.

Also change the type of these fields to `()` so there's no information here that the rest of the compiler could use. This supersedes the `rustc_lint_opt_deny_field_access` trick.

MCP: rust-lang/compiler-team#978
…=JonathanBrouwer

Reject outer attributes on `cfg_select` branches

Fixes rust-lang#155701.
…Brouwer

Simplify the creation of synthetic HIR.
…adwinwhite

Dep graph cleanups

Minor cleanups I found while looking at dep graph code. Details in individual commits.

r? @adwinwhite
…to-run-incr, r=nnethercote

Do not cache `lints_that_dont_need_to_run` across sessions

The `lints_that_dont_need_to_run` query depends on the lint store (which includes internal lints under `-Zunstable-options`). Because that flag is deliberately not part of the incremental command-line hash, incremental builds could load stale results from sessions with a different lint configuration, leading to an ICE.

This PR marks the query `eval_always` so it is recomputed for the current session instead of being loaded from cache.

Fixes rust-lang#156182.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label May 8, 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 8, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 8, 2026

📌 Commit 565ee37 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 May 8, 2026
@rust-bors rust-bors Bot mentioned this pull request May 8, 2026
@rust-bors

This comment has been minimized.

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

Rollup of 7 pull requests

Successful merges:

 - #156236 (resolve: Remove `MacroData`)
 - #156298 (Rename the unstable integer `extend` function to `widen`)
 - #154498 (turn some long-deprecated -C options into errors)
 - #155734 (Reject outer attributes on `cfg_select` branches)
 - #156123 (Simplify the creation of synthetic HIR.)
 - #156175 (Dep graph cleanups)
 - #156214 (Do not cache `lints_that_dont_need_to_run` across sessions)
@rust-log-analyzer
Copy link
Copy Markdown
Collaborator

The job x86_64-gnu-llvm-21-1 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
test expr_store::scope::tests::test_resolve_local_name_shadow ... ok
test expr_store::tests::body::block::inner_item_smoke ... ok
test expr_store::scope::tests::while_let_adds_binding ... ok
test expr_store::tests::body::array_element_cfg ... ok
error: test failed, to rerun pass `-p hir-def --lib`

Caused by:
  process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/hir_def-c439368f2b64a049 '--skip=tests::smoke_test_real_sysroot_cargo' --skip=check_code_formatting -Z unstable-options --format json` (signal: 11, SIGSEGV: invalid memory reference)
Bootstrap failed while executing `--stage 2 test --skip tests --skip coverage-map --skip coverage-run --skip library --skip tidyselftest`
Build completed unsuccessfully in 1:05:36
  local time: Fri May  8 10:48:05 UTC 2026
  network time: Fri, 08 May 2026 10:48:06 GMT
##[error]Process completed with exit code 1.

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

rust-bors Bot commented May 8, 2026

💔 Test for 3014362 failed: CI. Failed job:

@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

Ffs
@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 May 8, 2026
@rust-bors

This comment has been minimized.

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

rust-bors Bot commented May 8, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 48m 59s
Pushing f2b291d to main...

@rust-bors rust-bors Bot merged commit f2b291d into rust-lang:main May 8, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone May 8, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#154498 turn some long-deprecated -C options into errors 30b35c0bd9bf0035a52a0febfd07b5e1aeb683a1 (link)
#155734 Reject outer attributes on cfg_select branches 4bbd915757bf984b923ebd5a82768925b5c4bf14 (link)
#156123 Simplify the creation of synthetic HIR. 5c9fd5a4263ae0218d010566d8f30cf7c2335534 (link)
#156175 Dep graph cleanups bd59bbb2fb14f1c2722c0456a1356e479650fc62 (link)
#156214 Do not cache lints_that_dont_need_to_run across sessions 0e532948fc4e3127813308ef0f6a7e5030d3c9e0 (link)
#156236 resolve: Remove MacroData 4ae390763eb07c31cf927e6e33f3157b4dac1ac9 (link)
#156298 Rename the unstable integer extend function to widen 479560afee4b0d00dd7959e1e065e0c45d17c771 (link)

previous master: 3e353d7353

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 May 8, 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 3e353d7 (parent) -> f2b291d (this PR)

Test differences

Show 214 test diffs

Stage 1

  • [ui] tests/ui/compile-flags/removed_ar.rs: [missing] -> pass (J1)
  • [ui] tests/ui/deprecation/deprecated_ar.rs: pass -> [missing] (J1)
  • [ui] tests/ui/deprecation/deprecated_inline_threshold.rs#bad_val: pass -> [missing] (J1)
  • [ui] tests/ui/deprecation/deprecated_inline_threshold.rs#good_val: pass -> [missing] (J1)
  • [ui] tests/ui/deprecation/deprecated_inline_threshold.rs#no_val: pass -> [missing] (J1)
  • [ui] tests/ui/deprecation/deprecated_no_stack_check.rs: pass -> [missing] (J1)
  • [ui] tests/ui/deprecation/deprecated_no_stack_check_opt.rs: pass -> [missing] (J1)

Stage 2

  • [ui] tests/ui/compile-flags/removed_ar.rs: [missing] -> pass (J0)
  • [ui] tests/ui/deprecation/deprecated_ar.rs: pass -> [missing] (J0)
  • [ui] tests/ui/deprecation/deprecated_inline_threshold.rs#bad_val: pass -> [missing] (J0)
  • [ui] tests/ui/deprecation/deprecated_inline_threshold.rs#good_val: pass -> [missing] (J0)
  • [ui] tests/ui/deprecation/deprecated_inline_threshold.rs#no_val: pass -> [missing] (J0)
  • [ui] tests/ui/deprecation/deprecated_no_stack_check.rs: pass -> [missing] (J0)
  • [ui] tests/ui/deprecation/deprecated_no_stack_check_opt.rs: pass -> [missing] (J0)

Additionally, 200 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 f2b291d902bfde7d7f209fc3a64908134bcef201 --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. aarch64-apple: 2h 34m -> 3h 42m (+44.0%)
  2. dist-x86_64-apple: 1h 47m -> 2h 30m (+40.0%)
  3. x86_64-msvc-ext3: 1h 53m -> 1h 22m (-27.1%)
  4. dist-aarch64-apple: 2h 21m -> 2h 56m (+24.5%)
  5. dist-x86_64-netbsd: 1h 11m -> 1h 28m (+23.3%)
  6. i686-gnu-nopt-2: 2h 16m -> 1h 45m (-22.5%)
  7. x86_64-msvc-1: 2h 36m -> 2h 5m (-20.2%)
  8. x86_64-gnu-llvm-22-3: 1h 52m -> 1h 30m (-19.7%)
  9. x86_64-msvc-ext2: 1h 39m -> 1h 58m (+19.0%)
  10. dist-i586-gnu-i586-i686-musl: 1h 33m -> 1h 15m (-18.9%)
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 (f2b291d): comparison URL.

Overall result: ❌✅ regressions and 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.0% [0.0%, 0.1%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.1% [-0.2%, -0.0%] 3
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 0.3%, secondary 2.0%)

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

mean range count
Regressions ❌
(primary)
1.9% [1.9%, 1.9%] 1
Regressions ❌
(secondary)
2.0% [1.4%, 2.5%] 3
Improvements ✅
(primary)
-1.3% [-1.3%, -1.3%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.3% [-1.3%, 1.9%] 2

Cycles

Results (primary 2.4%, secondary 4.0%)

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

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

Binary size

Results (primary 0.0%, secondary 0.1%)

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%] 3
Regressions ❌
(secondary)
0.1% [0.0%, 0.1%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [0.0%, 0.0%] 3

Bootstrap: 497.449s -> 497.331s (-0.02%)
Artifact size: 397.06 MiB -> 395.05 MiB (-0.51%)

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

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. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants