Skip to content

Rollup of 11 pull requests #142033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jun 5, 2025
Merged

Rollup of 11 pull requests #142033

merged 23 commits into from
Jun 5, 2025

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jun 4, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Veykril and others added 23 commits June 3, 2025 13:35
…tion

This allows for testing these tests on editions other than 2015
It's currently skipped, presumably by accident.
It was already available as a generic parameter anyway, and it's not like we'll ever put a tag in the 5-billionth field.
Fix typo in src/etc/htmldocck.py

Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>

Change documentation link to the correct section in src/etc/htmldocck.py

Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>

Remove all top-level docs from htmldocck.py
The user has no clue what 'local binding' the compiler is talking about,
if they don't know the expansion of the macro.
The user has no clue what tail expression the compiler is talking
about: it is an implementation detail of the macro that it uses a block
with tail expression.
Add link to correct documentation in htmldocck.py
…asyncgen-fix, r=oli-obk

Fix for async drop inside async gen fn

Return value (for yield) is corrected for async drop inside async gen function.
In CFG, when internal async drop future is polled and returned `Poll<()>::Pending`, then async gen resume function returns `Poll<(OptRet)>::Pending`.

Fixes rust-lang#140530
…er-errors

Use non-2015 edition paths in tests that do not test for their resolution

This allows for testing these tests on editions other than 2015

Follow up to rust-lang#141888
…=wesleywiser

Run wfcheck in one big loop instead of per module

Maybe we can merge this big loop in the future with the `par_hir_body_owners` call below and run typeck only on items that didn't fail wfcheck. For now let's just see if perf likes it, as it by itself should be beneficial to parallel rustc
…n-vacation, r=Kobzol

Triagebot: Remove `assign.users_on_vacation`

It's been superseded by triagebot's [review queue tracking](https://forge.rust-lang.org/triagebot/review-queue-tracking.html), more specifically *rotation mode*.

r? Kobzol or triagebot
…-print, r=oli-obk

Ensure query keys are printed with reduced queries

Using `-Z query-dep-graph` and debug assertions leads to an ICE that was originally discovered in rust-lang#141700:

> This isn't an incremental bug per se, but instead a bug that has to do with debug printing query keys when debug assertions and `-Z query-dep-graph` is enabled. We end up printing a const (b/c we're using generic const args here) whose debug printing for -Z query-dep-graph requires invoking the same query cyclically 😃
>
> I've pushed a commit which should fix this.

This isn't related to the standard library changes, but instead b/c it seems to be the first usage of `feature(adt_const_params)` in the standard library that ends up being triggered in incremental tests.

r? oli-obk
…ler-errors

Visit the ident in `PreciseCapturingNonLifetimeArg`.

It's currently skipped, presumably by accident.

r? `@BoxyUwU`
…ple, r=workingjubilee

Change `tag_field` to `FieldIdx` in `Variants::Multiple`

It was already available as a generic parameter anyway, and it's not like we'll ever put a tag in the 5-billionth field.

This is a first part of pulling smaller pieces out of rust-lang#138759, so
r? workingjubilee
…ommend-over-recommended, r=lqd

Fix incorrect use of "recommend" over "recommended"

Spotted this typo in rust-lang#141554, but it has since been merged.

r? `@Noratrieb`
…trochenkov

Don't refer to 'this tail expression' in expansion.

The user has no clue what the compiler is talking about when it says "this tail expression". It is an implementation detail of the macro that it uses a block with tail expression.
…nszelmann

Don't refer to 'local binding' in extern macro.

When it comes from a macro expansion, the user has no clue what 'local binding' the compiler is talking about, if they don't know the expansion of the macro. Better to just say 'temporary value'.
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 4, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Jun 4, 2025

📌 Commit 4959ee3 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors 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 Jun 4, 2025
@matthiaskrgr
Copy link
Member Author

@bors p=5

@bors
Copy link
Collaborator

bors commented Jun 5, 2025

⌛ Testing commit 4959ee3 with merge 81a964c...

@bors
Copy link
Collaborator

bors commented Jun 5, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 81a964c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2025
@bors bors merged commit 81a964c into rust-lang:master Jun 5, 2025
11 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 5, 2025
Copy link
Contributor

github-actions bot commented Jun 5, 2025

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 ff223d3 (parent) -> 81a964c (this PR)

Test differences

Show 6 test diffs

Stage 1

  • [crashes] tests/crashes/140530.rs: pass -> [missing] (J1)
  • [incremental] tests/incremental/print-dep-node-cycle.rs: [missing] -> pass (J1)
  • [ui] tests/ui/async-await/async-drop/assign-incompatible-types.rs: [missing] -> pass (J1)

Stage 2

  • [crashes] tests/crashes/140530.rs: pass -> [missing] (J0)
  • [incremental] tests/incremental/print-dep-node-cycle.rs: [missing] -> pass (J0)
  • [ui] tests/ui/async-await/async-drop/assign-incompatible-types.rs: [missing] -> pass (J2)

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 81a964c23ea4fe9ab52b4449bb166bf280035797 --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-linux: 5897.4s -> 7981.6s (35.3%)
  2. x86_64-apple-2: 6010.6s -> 4251.8s (-29.3%)
  3. dist-x86_64-apple: 8227.7s -> 9736.7s (18.3%)
  4. dist-apple-various: 6004.3s -> 6840.7s (13.9%)
  5. x86_64-apple-1: 8162.6s -> 7196.0s (-11.8%)
  6. dist-armhf-linux: 4692.9s -> 5147.2s (9.7%)
  7. x86_64-gnu-aux: 6091.7s -> 5618.3s (-7.8%)
  8. dist-loongarch64-musl: 4907.0s -> 5278.2s (7.6%)
  9. dist-arm-linux-musl: 5702.5s -> 5340.3s (-6.4%)
  10. dist-powerpc64le-linux-musl: 5111.7s -> 5430.2s (6.2%)
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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#141890 Add link to correct documentation in htmldocck.py e427332a1070e79ec117a9ebc7f43b79593e11b0 (link)
#141932 Fix for async drop inside async gen fn a323f1882ef545c7ffb84017bd15952995ba801f (link)
#141960 Use non-2015 edition paths in tests that do not test for th… a1f008c7cf71cbcccb532fb0ebef258d5edd3226 (link)
#141968 Run wfcheck in one big loop instead of per module 8291611a2345b8808541dc571bb0c93be837036b (link)
#141969 Triagebot: Remove assign.users_on_vacation 6b945f36369b6a2bb1833f7cab4480cc23f9ce3d (link)
#141985 Ensure query keys are printed with reduced queries a7e5720d8e58a3599cd545bf7b616eaaeef61043 (link)
#141999 Visit the ident in PreciseCapturingNonLifetimeArg. 6ecb9bf1097437d44c2da1457812f88426df9e57 (link)
#142005 Change tag_field to FieldIdx in Variants::Multiple 2ae7c3d670c0edf636c1c63929099f4395f48896 (link)
#142017 Fix incorrect use of "recommend" over "recommended" d715aa0c875f61f8ff5bd359d9386d9e30474299 (link)
#142024 Don't refer to 'this tail expression' in expansion. 96e60ab56ed2d87a0a2926c3ffc60b60a5a4c269 (link)
#142025 Don't refer to 'local binding' in extern macro. 7b28ccde33f8cb3750872f26b41476be941740fa (link)

previous master: ff223d35cd

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (81a964c): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.3% [0.1%, 0.8%] 7
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 0.5%, secondary -2.5%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.5% [1.3%, 1.7%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.6% [-1.6%, -1.6%] 1
Improvements ✅
(secondary)
-2.5% [-5.9%, -0.7%] 4
All ❌✅ (primary) 0.5% [-1.6%, 1.7%] 3

Cycles

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

Binary size

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

Bootstrap: 751.112s -> 750.423s (-0.09%)
Artifact size: 371.83 MiB -> 371.83 MiB (-0.00%)

@matthiaskrgr
Copy link
Member Author

perf changes might be from #141968 ? 🤔

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. A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. 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-compiler Relevant to the compiler 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.