Skip to content

Rollup of 5 pull requests#153245

Closed
matthiaskrgr wants to merge 20 commits intorust-lang:mainfrom
matthiaskrgr:rollup-ecyWF99
Closed

Rollup of 5 pull requests#153245
matthiaskrgr wants to merge 20 commits intorust-lang:mainfrom
matthiaskrgr:rollup-ecyWF99

Conversation

@matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

Create a similar rollup

zetanumbers and others added 20 commits February 15, 2026 14:41
* add --ci flag in tidy

This commit introduces --ci flag in tidy because currently bootstrap can't pass its ci env information to tidy. It also modifies how CiInfo initialize its ci_env variable. tidy codes which uses CiEnv::is_ci for checking ci are now using ci_env in CiInfo.
* address review
- Fix comment
- Use Option for ci flag in order to have true/false explicitly or unspecified (implicit false)
* integrate CiInfo into TidyCtx
* remove CiInfo
* CiEnv::current() should be called when ci flag is not added
* extract base_commit() to a separate function
* use &TidyCtx instead of clone
This makes it clear the `CycleError` is not used after the call.
When there are two cases of equal size and importance, I find an if/else
expression easier to read than an early return.
It's an unnecessary level of indirection.
Calling `abort_if_errors` after emitting an error is guaranteed to call
`raise_fatal`, so just do that directly instead.
This exact comment block also appears in
`compiler/rustc_middle/src/queries.rs`, which is a better place for it.
`Value` is an unhelpfully generic name. Standard naming procedure for a
trait with a single method is for the trait name to match the method
name, which is what this commit does. Likewise, the enclosing module is
renamed from `values` to `from_cycle_error`.

Also add a comment about some non-obvious behaviour.
It has no effect.

`symbol_name` is the only query that produces a `SymbolName`. If it was
marked with `cycle_delayed_bug`/`cycle_stash` then this `FromCycleError`
impl would make sense, but that's not the case. Maybe it was the case in
the past.
…-closure-suggestion, r=JohnTitor

Suggest async block instead of async closure when possible

Fixes rust-lang#140265

r? @estebank
Introduce --ci flag in tidy

## Context
Currently tidy doesn't have `--ci` flag. Even if bootstrap has --ci=true, it isn't passed to tidy. As a result, some parts of tidy where we need to turn on `ci mode` are never executed on our local.

## Change
This PR introduces --ci flag in tidy, and modify CiInfo and other parts of tidy where currently use `CiEnv::is_ci()` for checking if the running environment is ci or not.
…ochenkov

Various small query cleanups

I found these while doing a close read of the query code.

r? @oli-obk
…51509, r=nnethercote

Disable debug_assert_not_in_new_nodes for multiple threads

Fixes rust-lang#152654

This debug assertion is no longer intended to succeed for the parallel compiler since rust-lang#151509 doesn't panic on a red-green query graph coloring race, generating both red and green nodes  (rust-lang#151509 (comment))
rustfmt: add test for field representing type builtin syntax

As requested by @ytmimi in rust-lang#152730 (comment).

Not sure if you want/need a more complex example. Just let me know.
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Mar 1, 2026
@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 A-tidy Area: The tidy tool 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-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue. labels Mar 1, 2026
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 1, 2026

📌 Commit 8e1ec75 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. 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-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 1, 2026

PR #153169, which is a member of this rollup, was unapproved.
This rollup was thus also unapproved.

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 1, 2026

☔ The latest upstream changes (presumably #153114) made this pull request unmergeable. Please resolve the merge conflicts.

@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 1, 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) A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool 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-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants