Skip to content

Rollup of 4 pull requests#153841

Closed
matthiaskrgr wants to merge 17 commits intorust-lang:mainfrom
matthiaskrgr:rollup-ihwBtPg
Closed

Rollup of 4 pull requests#153841
matthiaskrgr wants to merge 17 commits intorust-lang:mainfrom
matthiaskrgr:rollup-ihwBtPg

Conversation

@matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost

Create a similar rollup

oli-obk and others added 17 commits March 11, 2026 07:34
…cote

Replace `visit_waiters` with `abstracted_waiters_of`

This replaces `visit_waiters` which uses closures to visit waiters with `abstracted_waiters_of` which returns a list of waiters. This makes the control flow of their users a bit clearer.

Additionally `abstracted_waiters_of` includes non-query waiters unlike `visit_waiters`. This means that `connected_to_root` now considers resumable waiters from the compiler root as being connected to root, while previously only non-resumable waiters counted. This can result in some additional entry points being found. Similarly in the loop detecting entry points we now consider queries in the cycle with direct resumable waiters from the compiler root as being entry points.

When looking for entry points we now look at waiters until we found a query to populate the `EntryPoint.waiter` field instead of stopping when we determined it to be an entry point.

cc @petrochenkov @nnethercote
Reimplement const closures

Tracking issue: rust-lang#106003

Best reviewed commit-by-commit

The old solver can't handle `for<'a> |x: &'a()| ()` closures in const contexts, but that feature is unstable itself, so we can just leave it to the next solver to handle.

We need a lot more tests, we're testing the bare minimum of success and failure paths right now.

r? @fee1-dead
…r=WaffleLapkin

Fix std doctest build for SGX target.

This PR fixes standard library doctest build for `x86_64-fortanix-unknown-sgx` target.
…nnethercote

Remove `value_from_cycle_error` specializations

This removes `value_from_cycle_error` specializations which are not involved in custom cycle error handling.

This is a step towards removing query cycle recovery.
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Mar 13, 2026
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Mar 13, 2026
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 13, 2026

📌 Commit 5bdbc6b has been approved by matthiaskrgr

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 Mar 13, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 13, 2026

📌 Commit 5bdbc6b has been approved by matthiaskrgr

It is now in the queue for this repository.

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[TIMING:end] compile::Sysroot { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu, forced_compiler: false }, force_recompile: false } -- 0.000
[TIMING:end] builder::Libdir { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu, forced_compiler: false }, target: x86_64-unknown-linux-gnu } -- 0.000
[TIMING:end] compile::StdLink { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu, forced_compiler: false }, target_compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu, forced_compiler: false }, target: x86_64-unknown-linux-gnu, crates: [], force_recompile: false } -- 0.002
##[group]Building stage1 compiler artifacts (stage0 -> stage1, x86_64-unknown-linux-gnu)
error: process didn't exit successfully: `sccache /checkout/obj/build/bootstrap/debug/rustc -vV` (exit status: 2)
--- stderr
sccache: error: Timed out waiting for server startup. Maybe the remote service is unreachable?
Run with SCCACHE_LOG=debug SCCACHE_NO_DAEMON=1 to get more information

Bootstrap failed while executing `--stage 2 test tests/mir-opt --host= --target=i686-unknown-linux-gnu`
Build completed unsuccessfully in 0:00:17
  local time: Fri Mar 13 23:30:36 UTC 2026
  network time: Fri, 13 Mar 2026 23:30:37 GMT

@matthiaskrgr
Copy link
Member Author

@bors try

@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Mar 13, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 14, 2026

☀️ Try build successful (CI)
Build commit: 6a77dda (6a77dda8c6ec1a8916a9f9ae01cb52b0ffcc6f9e, parent: 1d8897a4e88051480b36c501e66809425c6e08ad)

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 14, 2026

⌛ Testing commit 5bdbc6b with merge 3384f19...

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

rust-bors bot pushed a commit that referenced this pull request Mar 14, 2026
Rollup of 4 pull requests

Successful merges:

 - #153376 (Replace `visit_waiters` with `abstracted_waiters_of`)
 - #153818 (Reimplement const closures)
 - #153774 (Fix std doctest build for SGX target.)
 - #153786 (Remove `value_from_cycle_error` specializations)
@Zalathar
Copy link
Member

dist-86x_64-linux has stalled; moving on to a rollup of everything.

@bors r-

@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 Mar 14, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 14, 2026

This pull request was unapproved.

Auto build was cancelled due to unapproval. Cancelled workflows:

@Zalathar Zalathar closed this Mar 14, 2026
@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 Mar 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. 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.

7 participants