Skip to content

Rollup of 3 pull requests#155145

Merged
rust-bors[bot] merged 9 commits intorust-lang:mainfrom
jhpratt:rollup-atReM8h
Apr 11, 2026
Merged

Rollup of 3 pull requests#155145
rust-bors[bot] merged 9 commits intorust-lang:mainfrom
jhpratt:rollup-atReM8h

Conversation

@jhpratt
Copy link
Copy Markdown
Member

@jhpratt jhpratt commented Apr 11, 2026

Successful merges:

r? @ghost

Create a similar rollup

scrabsha and others added 9 commits April 9, 2026 16:39
Currently all downloaded rustc and LLVM components are auto patched on
NixOS, but this is not done for libgccjit.so, so when GCC backend is
enabled on NixOS, the build ICEs with errors like this:

    thread 'rustc' (2286205) panicked at compiler/rustc_codegen_gcc/src/lib.rs:191:9:
    Cannot load libgccjit.so: libzstd.so.1: cannot open shared object file: No such file or directory

Fix this by auto-patch libgccjit.so, too. `zstd` is added to the dependency
environment.

Signed-off-by: Gary Guo <gary@garyguo.net>
…szelmann

distinguish "expected a single argument" and "expected an argument" on attribute parsing
bootstrap: auto-patch libgccjit.so for NixOS

Currently all downloaded rustc and LLVM components are auto patched on NixOS, but this is not done for libgccjit.so, so when GCC backend is enabled on NixOS, the build ICEs with errors like this:

    thread 'rustc' (2286205) panicked at compiler/rustc_codegen_gcc/src/lib.rs:191:9:
    Cannot load libgccjit.so: libzstd.so.1: cannot open shared object file: No such file or directory

Fix this by auto-patch libgccjit.so, too. `zstd` is added to the dependency environment.
…, r=JonathanBrouwer

Use a linting node closer the parsing of `#[cfg_attr]`

The parsing of `#[cfg_attr]` unconditionally used the crate-root as a linting node to attach lints, but the `unexpected_cfgs` lint can fire when parsing the attribute and users expect to be able to allow it at places other than the crate-root.

Let's instead use the linting node id, which is unfortunately always the parent but that's better than the crate-root when you are in a sub-module.

The parsing of `#[cfg]` and other already use the expansion linting node id, so no change required there.

Related to rust-lang#155118
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Apr 11, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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 Apr 11, 2026
@jhpratt
Copy link
Copy Markdown
Member Author

jhpratt commented Apr 11, 2026

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 11, 2026

📌 Commit b2088a2 has been approved by jhpratt

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

rust-bors bot commented Apr 11, 2026

☀️ Test successful - CI
Approved by: jhpratt
Duration: 3h 10m 5s
Pushing 5f36a7f to main...

@rust-bors rust-bors bot merged commit 5f36a7f into rust-lang:main Apr 11, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 11, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#154827 distinguish "expected a single argument" and "expected an a… 32de24c9a14eff5806069274d212319a47e8b64b (link)
#155104 bootstrap: auto-patch libgccjit.so for NixOS bfd820e0ccf12fb53f93b46dc2d37037671acdf7 (link)
#155120 Use a linting node closer the parsing of #[cfg_attr] 9b64c21dd2e621d2a0b7da79f67d59e2ac55a2af (link)

previous master: c29effdf79

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 c29effd (parent) -> 5f36a7f (this PR)

Test differences

Show 4 test diffs

Stage 1

  • [ui] tests/ui/check-cfg/allow-mod-level.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/check-cfg/allow-mod-level.rs: [missing] -> pass (J1)

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 5f36a7f8072e835d73d9e1f7ab8a2134ac7352dc --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: 2h 5m -> 1h 34m (-24.8%)
  2. dist-x86_64-musl: 1h 45m -> 2h 11m (+24.6%)
  3. x86_64-rust-for-linux: 52m 9s -> 44m 25s (-14.8%)
  4. pr-check-1: 33m 23s -> 28m 34s (-14.4%)
  5. i686-gnu-2: 1h 43m -> 1h 30m (-12.3%)
  6. pr-check-2: 42m 40s -> 37m 34s (-12.0%)
  7. i686-gnu-nopt-1: 2h 21m -> 2h 6m (-10.4%)
  8. x86_64-gnu-nopt: 2h 14m -> 2h 28m (+10.3%)
  9. dist-x86_64-llvm-mingw: 1h 59m -> 1h 47m (-9.6%)
  10. x86_64-gnu-tools: 1h -> 55m 11s (-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-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (5f36a7f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary -0.7%, secondary 1.4%)

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

Cycles

Results (primary -9.6%, secondary -4.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)
- - 0
Improvements ✅
(primary)
-9.6% [-20.7%, -3.1%] 13
Improvements ✅
(secondary)
-4.3% [-7.9%, -2.3%] 4
All ❌✅ (primary) -9.6% [-20.7%, -3.1%] 13

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

Bootstrap: 491.148s -> 491.284s (0.03%)
Artifact size: 394.19 MiB -> 394.15 MiB (-0.01%)

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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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

Development

Successfully merging this pull request may close these issues.

6 participants