Skip to content

Rollup of 12 pull requests - #163929

Closed
JonathanBrouwer wants to merge 28 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-ViSnZ96
Closed

JonathanBrouwer wants to merge 28 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-ViSnZ96

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

Warning

This rollup conflicts with pending auto build #163919 and may need to be recreated if the pending build succeeds.

r? @ghost

Create a similar rollup

Jules-Bertholet and others added 28 commits October 2, 2026 20:08
Co-Authored-By: Ralf Jung <post@ralfj.de>
The `StableHash` implementation for `Path` is used for attributes, which
never have generic args. However, nothing *prevents* using `StableHash`
for an arbitrary `Path` that might have generic args. Add a check for
this and panic.

Credit to Nick Nethercote for catching this.
The Reference warns when a `//@ reference:` annotation points to a
rule that isn't in the Reference.  Some of these had accumulated.
Let's clean them up.
This fixes the remaining call sites that were still hard coding values
for the key and discriminator. Instead, consult the session to get these
values through the schema. This follows the same pattern already used by
`get_fn_addr`.

No new tests were added, as the existing tests cover this change.
…, r=oli-obk

Distinguish `repr(C)` ZSTs from others in ABI computation

Implement rust-lang#157973:

Some C ABIs pass and return ZSTs by pointer. But `()` should never be returned by pointer, as it must match `void`. To fix this, distinguish `repr(C)`  ZSTs (and `repr(transparent)` wrappers around them) from other ZSTs in ABI computation.

Fixes rust-lang/unsafe-code-guidelines#552.

cc @RalfJung
…joshtriplett

Remove `NonOwner` variant from `AstOwner`

The refactoring extracted from rust-lang#163495 that should be responsible for memory improvements. And seems logical that enum `AstOwner` should not contain variant `NonOwner`.

r? @petrochenkov
Submodule update of rustc-perf

To bring in recent changes.

r? panstromek
…thercote

[PAC] Stop hard coding key and discriminator, consult schema instead

This fixes the remaining call sites that were still hard coding values for the `key` and `discriminator`.
Instead, consult the `session` to get these values through the `schema`. This follows the same pattern already used by `get_fn_addr`.

No new tests were added, as the existing tests cover this change.
…li-obk

Include offset in the alignment check when creating ConstValue::Indirect in GVN

This is a fix for rust-lang#163782.
explicitly check for fresh vars in canonicalize

otherwise we don't detect the bug in rust-lang#148632 with the new solver.

r? types
…y789

Don't add pkgs.rustc to PATH in nix dev shell

This has annoyed me since I switched to the shell provided by this repo.

The `shell.nix` dumps all dependencies of `x` into the shell path, which includes `pkgs.rustc`. The problem is that `pkgs.rustc` from nixpkgs is not managed by rustup, which means it doesn't support specifying the `+toolchain` to compile with. This also breaks the `src/tools/miri/miri` script, since it links a toolchain called `miri` and uses `rustc +miri` in multiple places.

This PR makes it so that `rustc` is not added to the env.

r? bootstrap
…=nnethercote

Panic on `StableHash` of a `Path` with `GenericArgs`

The `StableHash` implementation for `Path` is used for attributes, which never have generic args. However, nothing *prevents* using `StableHash` for an arbitrary `Path` that might have generic args. Add a check for this and panic.

Credit to Nick Nethercote (@nnethercote) for catching this.
…ations_cleanup-drift, r=PLeVasseur,traviscross

Clean up Reference annotations that drifted

The Reference warns when a `//@ reference:` annotation points to a rule that isn't in the Reference.  Some of these had accumulated. Let's clean them up.

r? @PLeVasseur

cc @DanielEScherzer

(As work within the scope of the lang-docs team, this falls outside the scope of the `forge#1040` policy; nonetheless, I'll note that this work was done with the assistance of AI tools and that this has been prearranged with all reviewers.)
…=Kobzol

Remove redundant closure in bootstrap

My PR rust-lang#163717 would make Clippy start linting `redundant_closure_for_method_calls` here; let's get ahead of that.

@rustbot label T-bootstrap
@rustbot ready

r? bootstrap
…r=ZuseZ4

Update Enzyme submodule

r? ZuseZ4
cc @wsmoses

@bors try jobs=dist-x86_64-linux,optional-test-x86_64-gnu-autodiff
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Oct 7, 2026
@rustbot rustbot added the A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. label Oct 7, 2026
@rustbot rustbot added F-autodiff `#![feature(autodiff)]` 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Oct 7, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=0 force

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,test-x86_64-gnu-aux,test-x86_64-msvc-1,test-aarch64-apple-1,test-aarch64-apple-2,test-x86_64-mingw-1,test-i686-msvc,test-armhf-gnu

@rust-bors

rust-bors Bot commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

📌 Commit b7506a3 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 Oct 7, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Oct 7, 2026
Rollup of 12 pull requests


try-job: dist-various-1
try-job: test-various
try-job: test-x86_64-gnu-aux
try-job: test-x86_64-msvc-1
try-job: test-aarch64-apple-1
try-job: test-aarch64-apple-2
try-job: test-x86_64-mingw-1
try-job: test-i686-msvc
try-job: test-armhf-gnu
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job test-x86_64-mingw-1 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

failures:

---- [ui] tests\ui\c-variadic\pass-by-value-abi.rs#win stdout ----
Saved the actual stderr to `D:\a\rust\rust\build\x86_64-pc-windows-gnu\test\ui\c-variadic\pass-by-value-abi.win\pass-by-value-abi.win.stderr`
diff of stderr:

22                            },
23                            max_repr_align: None,
24                            unadjusted_abi_align: Align(8 bytes),
-                            repr_c: true,
+                            repr_c: false,
26                            randomization_seed: $SEED,
27                        },
28                    },


The actual stderr differed from the expected stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args c-variadic\pass-by-value-abi.rs`

error in revision `win`: 1 errors occurred comparing output.
status: exit code: 1
command: PATH="D:\a\rust\rust\build\x86_64-pc-windows-gnu\stage2\bin;D:\a\rust\rust\ninja;D:\a\rust\rust\mingw64\bin;C:\msys64\usr\bin;D:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\7.0\bin;C:\vcpkg;C:\tools\zstd;C:\hostedtoolcache\windows\stack\3.11.1\x64;C:\cabal\bin;C:\ghcup\bin;C:\mingw64\bin;C:\Program Files\dotnet;C:\Program Files\MySQL\MySQL Server 8.0\bin;C:\Program Files\R\R-4.6.1\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\SeleniumWebDrivers\ChromeDriver;C:\Program Files (x86)\sbt\bin;C:\Program Files (x86)\GitHub CLI;C:\Program Files\Git\bin;C:\Program Files (x86)\pipx_bin;C:\npm\prefix;C:\hostedtoolcache\windows\go\1.24.13\x64\bin;C:\hostedtoolcache\windows\Python\3.12.10\x64\Scripts;C:\hostedtoolcache\windows\Python\3.12.10\x64;C:\hostedtoolcache\windows\Ruby\3.3.12\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\17.0.20-101\x64\bin;C:\Program Files\ImageMagick-7.1.2-Q16-HDRI;C:\Program Files\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\ProgramData\Chocolatey\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Microsoft SQL Server\170\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files\dotnet;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\WiX Toolset v3.14\bin;C:\Program Files\Microsoft SQL Server\130\DTS\Binn;C:\Program Files\Microsoft SQL Server\140\DTS\Binn;C:\Program Files\Microsoft SQL Server\150\DTS\Binn;C:\Program Files\Microsoft SQL Server\160\DTS\Binn;C:\Program Files\Microsoft SQL Server\170\DTS\Binn;C:\ProgramData\chocolatey\lib\pulumi\tools\Pulumi\bin;C:\Program Files\CMake\bin;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.9.16\bin;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\mongosh;C:\Program Files\LLVM\bin;C:\Program Files (x86)\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\stage2\\bin\\rustc.exe" "D:\\a\\rust\\rust\\tests\\ui\\c-variadic\\pass-by-value-abi.rs" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=C:\\Users\\runneradmin\\.cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=D:\\a\\rust\\rust\\vendor" "--sysroot" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\stage2" "--target=x86_64-pc-windows-gnu" "--cfg" "win" "--check-cfg" "cfg(test,FALSE,x86_64,aarch64,win)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\ui\\c-variadic\\pass-by-value-abi.win" "-Znext-solver=coherence" "-A" "unused" "-W" "unused_attributes" "-A" "internal_features" "-A" "incomplete_features" "-A" "unused_parens" "-A" "unused_braces" "-Crpath" "-Cdebuginfo=0" "-Lnative=D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\native\\rust-test-helpers" "--edition=2015" "-O"
stdout: none
--- stderr -------------------------------
error: fn_abi_of(take_va_list) = FnAbi {
           args: [
               ArgAbi {
                   layout: TyAndLayout {
                       ty: VaList<'_>,
                       layout: Layout {
---
Currently active steps:
test::Ui { test_compiler: Compiler { stage: 2, host: x86_64-pc-windows-gnu, forced_compiler: false }, target: x86_64-pc-windows-gnu } at src\bootstrap\src\core\build_steps\test.rs:1947
test::Compiletest { test_compiler: Compiler { stage: 2, host: x86_64-pc-windows-gnu, forced_compiler: false }, target: x86_64-pc-windows-gnu, mode: ui, suite: "ui", path: "tests/ui", compare_mode: None } at src\bootstrap\src\core\build_steps\test.rs:1947
Build completed unsuccessfully in 1:31:39
make: *** [Makefile:126: ci-mingw-x] Error 1
  local time: Wed Oct  7 11:55:42 CUT 2026
  network time: Wed, 07 Oct 2026 11:55:42 GMT
##[error]Process completed with exit code 2.
##[group]Run echo "disk usage:"
echo "disk usage:"

@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 7, 2026
@rust-bors

rust-bors Bot commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

PR #156112, which is a member of this rollup, was unapproved.

This rollup was thus unapproved.

@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 7, 2026
@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 7, 2026
@rust-bors

rust-bors Bot commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 2099433 failed: CI. Failed jobs:

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

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. F-autodiff `#![feature(autodiff)]` rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.