Skip to content

Rollup of 7 pull requests - #161810

Open
JonathanBrouwer wants to merge 24 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-0Rdmw3i
Open

Rollup of 7 pull requests#161810
JonathanBrouwer wants to merge 24 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-0Rdmw3i

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

LorrensP-2158466 and others added 24 commits August 2, 2026 18:10
Because `ActiveKeyStatus` wraps `QueryJob`, and `QueryState` is a
collection of `ActiveKeyStatus`es.
Because cycles are stored within `QueryWaiter`.

Also, rename `Cycle` as `QueryCycle`, to be less generic and match most
of the other nearby types.
It gains three types from `plumbing.rs` that define the high level query
system structures.
Because it's a clearer name.

Also move some call-related stuff from `plumbing.rs` to `calls.rs`.
At this point all `plumbing.rs` contains is the `define_callbacks!`
macro. Rename that macro as `define_query_api!` because it defines a lot
more than just callbacks. And also rename the file to match.
From `mod.rs` to `queries.rs`, the one file that uses it. This leaves
`mod.rs` containing only `use` and `mod` items.
Keeping up-to-date with wasi-sdk development.
When TEST_DEVICE_ADDR is set for cross-testing, the StdarchVerify step
incorrectly attempts to run on the remote target. Since stdarch-verify
is a host-only verification tool, skip it when remote testing is enabled.

Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
…query, r=Zalathar

Overhaul `rustc_middle::query`

Overhaul `rustc_middle::query`

The file/module structure is a mess. High-level changes:
- The vaguely-named mish-mash file `plumbing.rs` is split across multiple other files.
- The vaguely-named `inner.rs` gains some additions and becomes `calls.rs`.
- `system.rs` is added.
- New file `query_api.rs` is added. It contains the big macro, which is renamed from `define_callbacks` to `define_query_api`.

This is a follow-up to rust-lang#160843, which did a similar restructuring of `rustc_query_impl`.

r? @Zalathar
…=JonathanBrouwer,traviscross

rewrite never type documentation

With the never type stabilization in rust-lang#155499, I think the never type documentation needs be improved, as the status quo is not the best ^^'
…update, r=ShoyuVanilla

update `ambiguous_glob_imported_trait` lint explanation and example.

In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang#152822 someone reported that the explanation is lacking/confusing since rust-lang#159599.

Explanation and example are extended in this pr.
…=lcnr

Construct paramenvs from an iterator

r? @lcnr

Change things so paramenvs are created from iterators instead of already interned lists. In theory this may sometimes cause re-interning, but I haven't seen any performance change because of it. The advantage is that doing the interning becomes private API of paramenvs, so we can change how it works (by for example, compressing the paramenv in the future).

> [!NOTE]
> I've not used an LLM for any part of this PR, or any other PR I make. This includes any related work like research.
…-impl, r=mejrs

pattern_type: make print format match the current syntax

Print a pattern type using the `pattern_type!(type is pattern)` syntax instead of `(type) is pattern`.

This helps for example when suggesting fixes:  `(type) is pattern` is not valid rust right now but  `pattern_type!(type is pattern)` is.
This is not a bug as `pattern_type` is not on stable but it is a fairly impact-less change, just a print change.

discussion: [#t-compiler > pattern_type pretty format](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/pattern_type.20pretty.20format/with/618658793)

closes rust-lang/rust-clippy#17613
…rcoieni

Update WASI targets to wasi-sdk-34

Keeping up-to-date with wasi-sdk development.
…erify-remote, r=Kobzol

bootstrap: skip StdarchVerify when remote testing is enabled

When TEST_DEVICE_ADDR is set for cross-testing, the StdarchVerify step incorrectly attempts to run on the remote target. Since stdarch-verify is a host-only verification tool, skip it when remote testing is enabled.

Fixes : rust-lang#161800

r? @Kobzol
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Aug 26, 2026
@rustbot rustbot added the A-CI Area: Our Github Actions CI label Aug 26, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5

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

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 26, 2026
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Aug 26, 2026
@rust-bors

rust-bors Bot commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 29cda55 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 Aug 26, 2026
@rust-bors

This comment has been minimized.

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


try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple-1
try-job: aarch64-apple-2
try-job: x86_64-mingw-1
try-job: i686-msvc-1
try-job: i686-msvc-2
@rust-bors

rust-bors Bot commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

⌛ Testing commit 29cda55 with merge c241221...

Workflow: https://github.com/rust-lang/rust/actions/runs/32972629844

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

Rollup of 7 pull requests

Successful merges:

 - #161433 (Overhaul `rustc_middle::query`)
 - #158370 (rewrite never type documentation)
 - #160354 (update `ambiguous_glob_imported_trait` lint explanation and example.)
 - #161447 (Construct paramenvs from an iterator)
 - #161707 (pattern_type: make print format match the current syntax)
 - #161773 (Update WASI targets to wasi-sdk-34)
 - #161807 (bootstrap: skip StdarchVerify when remote testing is enabled)
@rust-bors

rust-bors Bot commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 4412253 (4412253654bb01058697555f0f84e080701c295d)
Base parent: 3ffb26f (3ffb26fbf5bf232cf59e314e75ea325973f4f583)

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

Labels

A-CI Area: Our Github Actions CI A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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. T-rustdoc Relevant to the rustdoc 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.

9 participants