Skip to content
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

Rollup of 8 pull requests #139220

Merged
merged 17 commits into from
Apr 2, 2025
Merged

Rollup of 8 pull requests #139220

merged 17 commits into from
Apr 2, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

xizheyin and others added 17 commits March 22, 2025 11:41
Co-authored-by: Mark Rousskov <[email protected]>
Co-authored-by: alexey semenyuk <[email protected]>
We also have to remove the LLVM argument in cast-target-abi.rs for LLVM
21. I'm not really sure what the best approach here is since that test
already uses revisions. We could also fork the test into a copy for LLVM
19-20 and another for LLVM 21, but what I did for now was drop the
lint-abort-on-error flag to LLVM figuring that some coverage was better
than none, but I'm happy to change this if that was a bad direction.

The above also applies for ffi-out-of-bounds-loads.rs.

r? dianqk
@rustbot label llvm-main
…r, r=GuillaumeGomez

rustdoc-json: Add test for #[automatically_derived] attribute

~~Will fail CI due to freestrings/jsonpath#91, but I wrote the test and don't want to forget it.~~

~~We should look into fixing the freestrings impl, or moving to a different one, so we can test things like this. [Zulip Disussion](https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/jsonpath-plus.20integration)~~

FIXED!!! By rust-lang#138763

r? ````@ghost````

````@rustbot```` blocked
…errors

Note potential but private items in show_candidates

Closes rust-lang#138626 .
We should add potential private items to give ample hints.
And for the other seemingly false positive ` pub use crate::one::Foo;` should be kept because we don't know if the user wants to import other module's items or not, and therefore should be given the full option to do so.
r? compiler
Add release notes for 1.86.0

Closes rust-lang#138795 (the draft)

cc ````@rust-lang/release````
````@rustbot```` ping relnotes-interest-group
increment depth of nested obligations

properly fixes the root cause of rust-lang#109268. While we didn't get hangs here before, I ended up encountering its root cause again with rust-lang#138785.

r? types
…-check-optimization, r=fee1-dead

Add tests for slice bounds check optimization

Closes rust-lang#134466
PassWrapper: adapt for llvm/llvm-project@94122d58fc77079a291a3d008914…

…006cb509d9db

We also have to remove the LLVM argument in cast-target-abi.rs for LLVM
21. I'm not really sure what the best approach here is since that test already uses revisions. We could also fork the test into a copy for LLVM 19-20 and another for LLVM 21, but what I did for now was drop the lint-abort-on-error flag to LLVM figuring that some coverage was better than none, but I'm happy to change this if that was a bad direction.

r? dianqk
````@rustbot```` label llvm-main
…r=eholk

Feed HIR for by-move coroutine body def, since the inliner tries to read its attrs

See the comments in the test.

I'm surprised that nobody found this[^1] (edit: nvm haha), but you have to go out of your way to construct the by-move body and then inline it w/ a poll call, so I guess the inliner just never really gets into this situation before.

Fixes rust-lang#134335

r? oli-obk

[^1]: Well, ````@eholk```` found this when working on the `iter! {}` macro, since it more dramatically affects those.
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend 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-release Relevant to the release subteam, 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 Apr 1, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 1, 2025

📌 Commit 99826dd 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 Apr 1, 2025
@bors
Copy link
Collaborator

bors commented Apr 1, 2025

⌛ Testing commit 99826dd with merge 9b7d5ac...

@bors
Copy link
Collaborator

bors commented Apr 2, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 9b7d5ac to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 2, 2025
@bors bors merged commit 9b7d5ac into rust-lang:master Apr 2, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 2, 2025
Copy link

github-actions bot commented Apr 2, 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 e2014e8 (parent) -> 9b7d5ac (this PR)

Test differences

Show 24 test diffs

Stage 1

  • [crashes] tests/crashes/134335.rs: pass -> [missing] (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/automatically_derived.rs: [missing] -> pass (J1)
  • [ui] tests/ui/async-await/async-closures/by-move-body-inlined-attrs.rs: [missing] -> pass (J1)
  • [ui] tests/ui/imports/show-private-items-issue-138626.rs: [missing] -> pass (J1)
  • [codegen] tests/codegen/slice-last-elements-optimization.rs: [missing] -> ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) (J2)
  • [codegen] tests/codegen/slice-last-elements-optimization.rs: [missing] -> ignore (ignored when the LLVM version 18.1.3 is older than 20.0.0) (J3)

Stage 2

  • [ui] tests/ui/async-await/async-closures/by-move-body-inlined-attrs.rs: [missing] -> pass (J0)
  • [ui] tests/ui/imports/show-private-items-issue-138626.rs: [missing] -> pass (J0)
  • [codegen] tests/codegen/slice-last-elements-optimization.rs: [missing] -> ignore (only executed when the architecture is x86_64) (J4)
  • [rustdoc-json] tests/rustdoc-json/attrs/automatically_derived.rs: [missing] -> pass (J5)
  • [codegen] tests/codegen/slice-last-elements-optimization.rs: [missing] -> ignore (ignored when the LLVM version 18.1.3 is older than 20.0.0) (J6)
  • [crashes] tests/crashes/134335.rs: pass -> [missing] (J7)
  • [codegen] tests/codegen/slice-last-elements-optimization.rs: [missing] -> ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) (J8)
  • [codegen] tests/codegen/slice-last-elements-optimization.rs: [missing] -> pass (J9)

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

Job group index

  • J0: aarch64-apple, aarch64-gnu, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-apple-2, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
  • J1: x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-3
  • J2: x86_64-gnu-llvm-19-3
  • J3: x86_64-gnu-llvm-18-3
  • J4: aarch64-apple, aarch64-gnu, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1
  • J5: aarch64-apple, aarch64-gnu, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, x86_64-apple-1, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
  • J6: x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2
  • J7: aarch64-apple, aarch64-gnu, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-apple-1, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
  • J8: x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2
  • J9: test-various, x86_64-apple-1, x86_64-gnu, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1

Job duration changes

  1. x86_64-apple-2: 4865.7s -> 5476.3s (12.5%)
  2. aarch64-gnu: 9690.0s -> 10203.2s (5.3%)
  3. x86_64-gnu-distcheck: 4741.5s -> 4987.6s (5.2%)
  4. dist-x86_64-msvc: 6041.8s -> 6344.2s (5.0%)
  5. dist-i686-msvc: 6820.5s -> 7135.9s (4.6%)
  6. dist-x86_64-freebsd: 4844.3s -> 5023.9s (3.7%)
  7. x86_64-gnu-llvm-19-3: 6700.7s -> 6919.7s (3.3%)
  8. x86_64-msvc-ext1: 7256.3s -> 7436.8s (2.5%)
  9. i686-mingw-1: 7534.0s -> 7696.9s (2.2%)
  10. x86_64-gnu-tools: 5971.9s -> 6092.3s (2.0%)
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
#110406 rustdoc-json: Add test for #[automatically_derived] attribu… 21f2e70f91df70129e1f30b65f35725ec100ec7a (link)
#138790 Note potential but private items in show_candidates 1f2a6c705585ce17268f14aac95c46eb7741604a (link)
#139002 Add release notes for 1.86.0 8a45371403f29c494423b9c4f80da822aa8be0ac (link)
#139022 increment depth of nested obligations 4fbc00926c6d4c046a7633cfc210abb0c60c888d (link)
#139129 Add tests for slice bounds check optimization fff93a3715f921d8ab4ee1cf950b14772e683f0d (link)
#139188 PassWrapper: adapt for llvm/llvm-project@94122d58fc77079a29 e9a4db2f7e170cc0c7e5e264f4cba2ba44147bc4 (link)
#139193 Feed HIR for by-move coroutine body def, since the inliner … 3d1aa02cb45cacd46f2049fb86efd379dd401dcd (link)
#139202 Improve docs of ValTreeKind 2207beafd8ffa73c183deec8b6b8ee49c51ef4d8 (link)

previous master: e2014e876e

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 (9b7d5ac): 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)

Results (primary -2.5%, secondary 5.1%)

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)
- - 0
Regressions ❌
(secondary)
5.1% [5.1%, 5.1%] 1
Improvements ✅
(primary)
-2.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.5% [-2.5%, -2.5%] 1

Cycles

Results (primary 4.8%, secondary 2.9%)

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)
4.8% [4.8%, 4.8%] 1
Regressions ❌
(secondary)
2.9% [2.9%, 2.9%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 4.8% [4.8%, 4.8%] 1

Binary size

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

Bootstrap: 774.756s -> 774.901s (0.02%)
Artifact size: 365.95 MiB -> 365.95 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-json Area: Rustdoc JSON backend 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-release Relevant to the release subteam, 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.