Skip to content

Rollup of 6 pull requests #140336

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 13 commits into from
Apr 26, 2025
Merged

Rollup of 6 pull requests #140336

merged 13 commits into from
Apr 26, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

alexcrichton and others added 13 commits April 23, 2025 14:37
This commit updates the vendored `wasm-component-ld` binary to 0.5.13
which includes some various bug fixes and new feature updates for
upcoming component model features coming down the pike. Not expected to
break any existing workflows, just a normal update.
Note that `NonZero` support is not wired up, as the author encountered
bugs while attempting this. A future commit will wire up `NonZero`
support.
…o, r=jswrenn

transmutability: Support char, NonZeroXxx

Note that `NonZero` support is not wired up, as the author encountered
bugs while attempting this. A future commit will wire up `NonZero`
support.

r? ````@jswrenn````
…-ld, r=jieyouxu

Update wasm-component-ld to 0.5.13

This commit updates the vendored `wasm-component-ld` binary to 0.5.13 which includes some various bug fixes and new feature updates for upcoming component model features coming down the pike. Not expected to break any existing workflows, just a normal update.
Remove redundant check

We still check for `rustc_on_unimplemented` on implementations, but this functionality was removed in rust-lang#139091, since then it always returns `Ok` when called with a non-trait defid.

https://github.com/rust-lang/rust/blob/b4c8b0c3f0533bb342a4873ff59bdad3883ab8e3/compiler/rustc_trait_selection/src/error_reporting/traits/on_unimplemented.rs#L557-L564
…fn-kind-err, r=fee1-dead

Simply try to unpeel AsyncFnKindHelper goal in `emit_specialized_closure_kind_error`

Tweak the handling of `AsyncFnKindHelper` goals in `emit_specialized_closure_kind_error` to not be so special-casey, and just try to unpeel one or two layers of obligation causes to get to their underlying `AsyncFn*` goal.

Fixes rust-lang#140292
replace `GenericArg` with `Term` where applicable

r? types
…for-bufread-has-data-left-docs, r=jhpratt

Grammar fixes for BufRead::has_data_left docs

Fix some grammar in the documentation for `BufRead::has_data_left`
@rustbot rustbot added 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-libs Relevant to the library 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 Apr 26, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 26, 2025

📌 Commit 153eeb0 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 26, 2025
@bors
Copy link
Collaborator

bors commented Apr 26, 2025

⌛ Testing commit 153eeb0 with merge 10fa3c4...

@bors
Copy link
Collaborator

bors commented Apr 26, 2025

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

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#140215 transmutability: Support char, NonZeroXxx 36a3168b94b96e4f90a861bc03269e51bebfd2e0 (link)
#140226 Update wasm-component-ld to 0.5.13 e6c2cb9f8aeb2740689a37a4cf1526a0939f3ab7 (link)
#140317 Remove redundant check df6b42a509967a2517ebb41227d5f7cb3b6ec0cd (link)
#140318 Simply try to unpeel AsyncFnKindHelper goal in `emit_specia… 8871184e334c915e3e551b3a20e345cc9c53c249 (link)
#140320 replace GenericArg with Term where applicable d07225fcb8e69794958988b7db7e8f0975f5a3d9 (link)
#140325 Grammar fixes for BufRead::has_data_left docs 0b9479a404ad7af847499b51d82c6d662eeb206b (link)

previous master: 5ae50d3b21

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 5ae50d3 (parent) -> 10fa3c4 (this PR)

Test differences

Show 23 test diffs

Stage 1

  • [ui] tests/ui/async-await/async-closures/kind-due-to-arg-with-box-wrap.rs: [missing] -> pass (J1)
  • [ui] tests/ui/transmutability/char.rs: [missing] -> pass (J1)
  • maybe_transmutable::tests::char::should_permit_valid_transmutation: [missing] -> pass (J2)
  • maybe_transmutable::tests::nonzero::should_permit_identity_transmutation: [missing] -> pass (J2)
  • maybe_transmutable::tests::nonzero::should_permit_valid_transmutation: [missing] -> pass (J2)

Stage 2

  • [ui] tests/ui/async-await/async-closures/kind-due-to-arg-with-box-wrap.rs: [missing] -> pass (J0)
  • [ui] tests/ui/transmutability/char.rs: [missing] -> pass (J0)

Additionally, 16 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 10fa3c449f6b1613b352a6cbf78d3d91fd9a1d81 --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-apple-various: 6904.5s -> 7821.8s (13.3%)
  2. x86_64-gnu-stable: 6672.9s -> 7498.7s (12.4%)
  3. dist-aarch64-apple: 5530.6s -> 5027.7s (-9.1%)
  4. x86_64-apple-2: 5055.8s -> 5502.6s (8.8%)
  5. dist-x86_64-apple: 7086.1s -> 7512.3s (6.0%)
  6. x86_64-gnu-llvm-19-1: 5338.0s -> 5095.1s (-4.6%)
  7. dist-armhf-linux: 5084.4s -> 5315.4s (4.5%)
  8. dist-i686-linux: 5809.8s -> 6031.7s (3.8%)
  9. aarch64-apple: 3945.2s -> 4081.6s (3.5%)
  10. aarch64-gnu-debug: 4114.0s -> 3974.6s (-3.4%)
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 (10fa3c4): 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.4%, 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)
0.7% [0.7%, 0.7%] 1
Regressions ❌
(secondary)
2.9% [2.9%, 2.9%] 1
Improvements ✅
(primary)
-3.4% [-8.9%, -0.5%] 3
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.4% [-8.9%, 0.7%] 4

Cycles

Results (primary 0.0%, secondary 2.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)
2.6% [2.6%, 2.6%] 1
Regressions ❌
(secondary)
2.1% [2.1%, 2.1%] 1
Improvements ✅
(primary)
-1.3% [-1.6%, -1.0%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [-1.6%, 2.6%] 3

Binary size

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

Bootstrap: 776.211s -> 763.667s (-1.62%)
Artifact size: 365.21 MiB -> 365.13 MiB (-0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-libs Relevant to the library 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