Skip to content

Rollup of 8 pull requests #141397

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 18 commits into from
May 22, 2025
Merged

Rollup of 8 pull requests #141397

merged 18 commits into from
May 22, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

marcoieni and others added 18 commits May 21, 2025 18:50
It was added in rust-lang#140052, but the subsequent changes in rust-lang#140252 means it
is no longer necessary. (Indeed, `Ident`s cannot be empty any more.)
`Ident`s can no longer be empty, so the test always succeeds.
Fix `FnOnce` impl for `AsyncFn`/`AsyncFnMut` self-borrowing closures in new solver

This only affects closures that are "`AsyncFn`/`AsyncFnMut`" in their calling capability that are being called with the `FnOnce` trait.

fixes rust-lang/trait-system-refactor-initiative#217

r? lcnr
…=lcnr

Normalize aliases to correct kind of error term

Fixes rust-lang#140642

When normalizing an alias to an error in the old solver, normalize to the same term kind as the alias being normalized instead of always to a type error.

r? lcnr
…y-checks, r=GuillaumeGomez

Remove unnecessary `is_empty` checks

Part of rust-lang#137978.

r? `@GuillaumeGomez`
…rovenance, r=tgross35

try_cast_aligned: avoid bare int-to-ptr casts

This fixes a CI failure in https://github.com/rust-lang/miri-test-libstd caused by strict provenance violations in doctests added in rust-lang#141222.

r? `@tgross35`
Cc `@mathisbot`
…bzol

ci: convert distcheck to free runner

try-job: x86_64-gnu-distcheck
…, r=Kobzol

ci: prepare aws access keys for migration
…lver, r=lcnr

Don't allow `poly_select` in new solver

I added a `poly_select` call in rust-lang#140519, but this causes an ICE since the new solver doesn't properly handle the "instantiate binder -> recanonicalize" step in the proof tree visitor.

While we could fix the select visitor to look at the next step in proof tree, it's not really necessary. Instead, let's enforce that all callees call the non-higher-ranked `select` function in the new solver.

Fixes rust-lang#141322

r? lcnr
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels May 22, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=3

@bors
Copy link
Collaborator

bors commented May 22, 2025

📌 Commit 580bd6e 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 May 22, 2025
@jieyouxu
Copy link
Member

@bors p=10 (contains a more time-sensitive CI change)

@bors
Copy link
Collaborator

bors commented May 22, 2025

⌛ Testing commit 580bd6e with merge e3892a40a9d06034fdf2432a9d3d29fa97726299...

@bors
Copy link
Collaborator

bors commented May 22, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 22, 2025
@bors bors merged commit e3892a4 into rust-lang:master May 22, 2025
7 checks passed
@rustbot rustbot added this to the 1.89.0 milestone May 22, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#141355 ci: improve citool job db errors a6b08c6da94ccd9295e4041a138725e09e04ddf9 (link)
#141359 Fix FnOnce impl for AsyncFn/AsyncFnMut self-borrowing… cfe99728c829f599dfab3832365334610f3b13a0 (link)
#141362 Normalize aliases to correct kind of error term 7b92f0c0ff304be51f1ba80d70bd5651a12116cb (link)
#141377 Remove unnecessary is_empty checks dcae52f4e09cf181b9b4ac443449e21e2fc41ceb (link)
#141381 try_cast_aligned: avoid bare int-to-ptr casts b717a97bddc3f3fe7beee46e22c65ed386c024f4 (link)
#141382 ci: convert distcheck to free runner 2c4f761993a7f461ed56ed63efa96ed185918ed8 (link)
#141389 ci: prepare aws access keys for migration 7bf2aad41b513467d55912fdf3758967de350a70 (link)
#141390 Don't allow poly_select in new solver 57866d57a67867fc5d597cd80d42caa41dde4306 (link)

previous master: d423c815a6

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

Copy link

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 d423c81 (parent) -> e3892a4 (this PR)

Test differences

Show 314 test diffs

Stage 1

  • [crashes] tests/crashes/140642.rs: pass -> [missing] (J1)
  • [ui] tests/ui/async-await/async-closures/async-fn-mut-impl-fn-once.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/async-await/async-closures/async-fn-mut-impl-fn-once.rs#next: [missing] -> pass (J1)
  • [ui] tests/ui/const-generics/mgca/projection-error.rs: [missing] -> pass (J1)
  • [ui] tests/ui/mismatched_types/hr-projection-mismatch.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/mismatched_types/hr-projection-mismatch.rs#next: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/async-await/async-closures/async-fn-mut-impl-fn-once.rs#current: [missing] -> pass (J0)
  • [ui] tests/ui/async-await/async-closures/async-fn-mut-impl-fn-once.rs#next: [missing] -> pass (J0)
  • [ui] tests/ui/const-generics/mgca/projection-error.rs: [missing] -> pass (J0)
  • [ui] tests/ui/mismatched_types/hr-projection-mismatch.rs#current: [missing] -> pass (J0)
  • [ui] tests/ui/mismatched_types/hr-projection-mismatch.rs#next: [missing] -> pass (J0)
  • [crashes] tests/crashes/140642.rs: pass -> [missing] (J2)

Additionally, 302 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 e3892a40a9d06034fdf2432a9d3d29fa97726299 --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. x86_64-gnu-distcheck: 4824.9s -> 8171.1s (69.4%)
  2. x86_64-apple-1: 6518.2s -> 7857.7s (20.6%)
  3. dist-x86_64-apple: 7382.4s -> 8682.8s (17.6%)
  4. x86_64-apple-2: 6019.6s -> 5096.3s (-15.3%)
  5. x86_64-gnu-llvm-20-1: 5135.3s -> 5650.5s (10.0%)
  6. aarch64-apple: 4282.7s -> 4682.3s (9.3%)
  7. x86_64-gnu-llvm-19-1: 5231.7s -> 5633.6s (7.7%)
  8. x86_64-gnu-tools: 6120.0s -> 5652.8s (-7.6%)
  9. dist-ohos-armv7: 4705.1s -> 4429.2s (-5.9%)
  10. dist-x86_64-illumos: 5955.0s -> 5609.0s (-5.8%)
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 (e3892a4): 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 -0.8%)

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

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: 776.699s -> 776.4s (-0.04%)
Artifact size: 365.63 MiB -> 365.61 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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. T-rustdoc Relevant to the rustdoc 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.

10 participants