Skip to content

Rollup of 14 pull requests - #163943

Closed
JonathanBrouwer wants to merge 39 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-ZM36gwB
Closed

JonathanBrouwer wants to merge 39 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-ZM36gwB

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

Warning

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

r? @ghost

Create a similar rollup

lcnr and others added 30 commits October 6, 2026 11:27
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.
otherwise these won't ICE
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.
…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
add revisions for `pass -> [err|ICE]` ui tests `-Znext-solver`

r? types
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
…x, r=BoxyUwU

abby DSL: change `where` syntax to `predicates`

Fixes rust-lang/project-assumptions-on-binders#53

The `where` syntax was very confusing, and caused at least one instance of bringing folks up to speed on abby being made more difficult due to the bad syntax:

```rust
core::test_binder_constraints! {
    impl {
        forall<'a, 'b> where 'a: 'b {
            where 'a: 'b
        }
    }
}
```

The two `where` here mean VERY different things. This PR changes the second one to be `predicates`. The name sucks, but Boxy and I bikeshedded for ages and couldn't come up with anything better.

The only reason it was done this way was because the parser has `self.eat_keyword(exp!(Where))` baked into `parse_where_clause_common` and it was vaguely annoying to refactor to reuse it with a different syntax. This PR does the vaguely annoying refactor.

r? @BoxyUwU
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Oct 7, 2026
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 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 182c8ef 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 14 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-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 closed this Oct 7, 2026
@rust-bors

rust-bors Bot commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

PR #163908, which is a member of this rollup, changed its commit SHA to 0d7fdb5483fa1c588e85ba9f7d31704ad5734179.

This rollup was thus unapproved due to being closed.

@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 mentioned this pull request Oct 7, 2026
@rust-bors

rust-bors Bot commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: c0be2e2 (c0be2e2aee4061bbca22c7c10f59af991c0d4c3a)
Base parent: 8d1a764 (8d1a76430406c877b35d0b627e7f796dcf0dfeca)

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 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.