Skip to content

Rollup of 5 pull requests#153252

Merged
rust-bors[bot] merged 11 commits intorust-lang:mainfrom
matthiaskrgr:rollup-uYxeyaV
Mar 1, 2026
Merged

Rollup of 5 pull requests#153252
rust-bors[bot] merged 11 commits intorust-lang:mainfrom
matthiaskrgr:rollup-uYxeyaV

Conversation

@matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost

Create a similar rollup

zetanumbers and others added 11 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 commit:
- Renames the query vtable field `hash_result` to `hash_value_fn`
- Removes the unhelpful `HashResult` type alias, which was hiding an
  important layer of `Option`
- Replaces the cryptic `hash_result!` helper macro with a more straightforward
  `if_no_hash!` helper, in line with other modifier-checking macros
- Renames a few identifiers to refer to a query's return value as `value`
…-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.
…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))
Clean up `QueryVTable::hash_result` into `hash_value_fn`

This PR:
- Renames the query vtable field `hash_result` to `hash_value_fn`
- Removes the unhelpful `HashResult` type alias, which was hiding an important layer of `Option`
- Replaces the cryptic `hash_result!` helper macro with a more straightforward `if_no_hash!` helper, in line with other modifier-checking macros
- Renames a few identifiers to refer to a query's return value as `value`

There should be no change to compiler behaviour.

r? nnethercote (or compiler)
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 d9c27fd 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 1, 2026
@rust-bors

This comment has been minimized.

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

Successful merges:

 - #152042 (Suggest async block instead of async closure when possible)
 - #152949 (Introduce --ci flag in tidy)
 - #152655 (Disable debug_assert_not_in_new_nodes for multiple threads)
 - #153209 (Clean up `QueryVTable::hash_result` into `hash_value_fn`)
 - #153229 (rustfmt: add test for field representing type builtin syntax)
@Zalathar
Copy link
Member

Zalathar commented Mar 1, 2026

x86_64-gnu-aux is stalled and very unlikely to finish within 6 hours.

@bors cancel

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 1, 2026

Auto build cancelled. Cancelled workflows:

The next pull request likely to be tested is #153252.

@rust-bors

This comment has been minimized.

@rust-bors rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed 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

☀️ Test successful - CI
Approved by: matthiaskrgr
Duration: 3h 10m 32s
Pushing 024757f to main...

@rust-bors rust-bors bot merged commit 024757f into rust-lang:main Mar 1, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 1, 2026
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#152042 Suggest async block instead of async closure when possible 7cf2e9c82d75c3d6c36f51c7f72cc606dba6cc3d (link)
#152655 Disable debug_assert_not_in_new_nodes for multiple threads 541933d011d4e92d3a09e2dae0dbe70224796299 (link)
#152949 Introduce --ci flag in tidy d1e97f0c59baf8d221948d54a8cce3823e2eabc8 (link)
#153209 Clean up QueryVTable::hash_result into hash_value_fn a9babb747066172ad3237b43392bf601fe8b033c (link)
#153229 rustfmt: add test for field representing type builtin syntax 6bbaeae4dadf1239ef6a9514337e34ab06b779ca (link)

previous master: 765fd2d8c7

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions
Copy link
Contributor

github-actions bot commented Mar 1, 2026

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 765fd2d (parent) -> 024757f (this PR)

Test differences

Show 7 test diffs

Stage 0

  • arg_parser::tests::test_tidy_parse_ci_flag: [missing] -> pass (J0)

Stage 1

  • [ui] tests/ui/async-await/async-closures/suggest-async-block-issue-140265.rs: [missing] -> pass (J2)

Stage 2

  • [ui] tests/ui/async-await/async-closures/suggest-async-block-issue-140265.rs: [missing] -> pass (J1)

Additionally, 4 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 024757fea5c9ac50d7cc81f5f3a686d0a3a3cf9e --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-aarch64-llvm-mingw: 1h 48m -> 1h 28m (-18.8%)
  2. dist-aarch64-msvc: 1h 56m -> 1h 38m (-15.1%)
  3. x86_64-gnu-debug: 1h 44m -> 1h 54m (+10.1%)
  4. x86_64-gnu: 2h 2m -> 2h 14m (+9.8%)
  5. aarch64-gnu-llvm-20-1: 59m 12s -> 53m 42s (-9.3%)
  6. dist-apple-various: 1h 36m -> 1h 28m (-8.3%)
  7. dist-aarch64-apple: 2h 12m -> 2h 1m (-8.3%)
  8. x86_64-gnu-llvm-21-3: 1h 53m -> 1h 44m (-8.2%)
  9. x86_64-mingw-1: 2h 38m -> 2h 51m (+8.1%)
  10. x86_64-rust-for-linux: 45m 34s -> 42m 15s (-7.3%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (024757f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results (secondary -0.5%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.5% [3.5%, 3.7%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-6.7% [-6.7%, -6.6%] 2
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 477.793s -> 477.708s (-0.02%)
Artifact size: 397.19 MiB -> 397.23 MiB (0.01%)

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 merged-by-bors This PR was explicitly merged by bors. 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.

8 participants