Skip to content

Rollup of 14 pull requests #143233

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 35 commits into from
Jun 30, 2025
Merged

Rollup of 14 pull requests #143233

merged 35 commits into from
Jun 30, 2025

Conversation

dianqk
Copy link
Member

@dianqk dianqk commented Jun 30, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 30 commits June 27, 2025 16:29
Prepare for rework done in the rest of [PR143118].

[PR143118]: https://www.github.com/rust-lang/rust/pull/143118

Co-authored-by: Kivooeo <Kivooeo123@gmail.com>
- Update ui.md
- Update type-alias-impl-trait.md
- Update README.md
Avoid introducing a large number of changes when adding optional initialization fields.
plus various minor tweaks
Add an empty `impl ! {}` so `rustdoc` generates auto trait impls and blanket impls on `!`'s documentation page.
`tests/ui`: A New Order [13/N]

Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of rust-lang#133895.

r? ```@jieyouxu```
…-pow, r=RalfJung

Miri: handling of SNaN inputs in `f*::pow` operations

fixes [miri/rust-lang#4286](rust-lang/miri#4286) and related to rust-lang#138062 and [miri/rust-lang#4208](rust-lang/miri#4208 (comment)).

For the following cases of the powf or powi operations, Miri returns either `1.0` or an arbitrary `NaN`:
- `powf(SNaN, 0.0)`
- `powf(1.0, SNaN)`
- `powi(SNaN, 0)`

Also added a macro in `miri/tests/pass/float.rs` which conveniently checks if both are indeed returned from such an operation.

Made these changes in the rust repo so I could test against stdlib, since these were impacted some time ago and were fixed in rust-lang#138062. Tested with:
```fish
env MIRIFLAGS=-Zmiri-many-seeds ./x miri --no-fail-fast std core coretests -- f32 f64
```
This was successful. This does take a while, so I recommend using `--no-doc` and separate use of `f32` or `f64`

The pr is somewhat split up into 3 main commits, which implement the cases described above. The first commit also introduces the macro, and the last commit is just a global refactor of some things.

r? `@RalfJung`
…r=lcnr

Use let chains in the new solver

Self-explanatory

Let chains are stable as of today

r? lcnr
Workaround for memory unsafety in third party DLLs

Resolves rust-lang#143078

Note that we can't make any guarantees if third parties intercept OS functions and don't implement them according to the documentation. However, I think it's practical to attempt mitigations when issues are encountered in the wild and the mitigation itself isn't too invasive.
`tests/ui`: A New Order [15/N]

> [!NOTE]
>
> Intermediate commits are intended to help review, but will be squashed prior to merge.

Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of rust-lang#133895.

r? `@jieyouxu`
…r=oli-obk

Do not freshen `ReError`

Because `ReError` has `ErrorGuaranteed` in it, it affects candidate selection and thus causes incompleteness which leads to weirdness in eval. See the comment in the test.

Also remove an unnecessary `lookup_op_method` since it doesn't effect tests.

Fixes rust-lang#132882.

r? types
`tests/ui`: A New Order [16/N]

> [!NOTE]
>
> Intermediate commits are intended to help review, but will be squashed prior to merge.

Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of rust-lang#133895.

r? `@tgross35`

(just small one to test new method, also I should squash all this commits except move commit, so we after review will end up having like one move commit and one commit with changes, right?)
fix typos and improve clarity in documentation

```
Description:

This pull request corrects minor typos and improves wording for clarity across several documentation files, including:

- Correcting instrinsics → intrinsics
- Correcting preferrably → preferably
- Correcting Orginally → Originally
-  Correcting resiliant → resilient

```
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide A-rustdoc-json Area: Rustdoc JSON backend A-tidy Area: The tidy tool O-windows Operating system: Windows 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-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 Jun 30, 2025
@dianqk
Copy link
Member Author

dianqk commented Jun 30, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jun 30, 2025

📌 Commit c2904f7 has been approved by dianqk

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 30, 2025
@bors
Copy link
Collaborator

bors commented Jun 30, 2025

⌛ Testing commit c2904f7 with merge c65dcca...

@bors
Copy link
Collaborator

bors commented Jun 30, 2025

☀️ Test successful - checks-actions
Approved by: dianqk
Pushing c65dcca to master...

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

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 ad3b725 (parent) -> c65dcca (this PR)

Test differences

Show 317 test diffs

Stage 1

  • [rustdoc-json] tests/rustdoc-json/attrs/link_section_2021.rs: [missing] -> pass (J1)
  • [rustdoc-json] tests/rustdoc-json/attrs/link_section_2024.rs: [missing] -> pass (J1)
  • [ui] tests/ui/codegen/maximal-hir-to-mir-coverage-flag.rs: [missing] -> pass (J1)
  • [ui] tests/ui/codegen/msvc-opt-level-z-no-corruption.rs: [missing] -> ignore (only executed when the operating system is windows) (J1)
  • [ui] tests/ui/derives/derive-Debug-enum-variants.rs: [missing] -> pass (J1)
  • [ui] tests/ui/fmt/debug-single-call.rs: [missing] -> pass (J1)
  • [ui] tests/ui/indexing/indexing-integral-types.rs: [missing] -> pass (J1)
  • [ui] tests/ui/inner-module.rs: pass -> [missing] (J1)
  • [ui] tests/ui/inner-static-type-parameter.rs: pass -> [missing] (J1)
  • [ui] tests/ui/integral-indexing.rs: pass -> [missing] (J1)
  • [ui] tests/ui/integral-variable-unification-error.rs: pass -> [missing] (J1)
  • [ui] tests/ui/invalid_dispatch_from_dyn_impls.rs: pass -> [missing] (J1)
  • [ui] tests/ui/link-section.rs: pass -> [missing] (J1)
  • [ui] tests/ui/linkage-attr/link-section-placement.rs: [missing] -> pass (J1)
  • [ui] tests/ui/linkage-attr/msvc-static-data-import.rs: [missing] -> pass (J1)
  • [ui] tests/ui/lint/missing-debug-implementations-lint.rs: [missing] -> pass (J1)
  • [ui] tests/ui/log-err-phi.rs: pass -> [missing] (J1)
  • [ui] tests/ui/log-knows-the-names-of-variants.rs: pass -> [missing] (J1)
  • [ui] tests/ui/max-min-classes.rs: pass -> [missing] (J1)
  • [ui] tests/ui/maximal_mir_to_hir_coverage.rs: pass -> [missing] (J1)
  • [ui] tests/ui/maybe-bounds.rs: pass -> [missing] (J1)
  • [ui] tests/ui/method-output-diff-issue-127263.rs: pass -> [missing] (J1)
  • [ui] tests/ui/mismatched_types/fn-pointer-mismatch-diagnostics.rs: [missing] -> pass (J1)
  • [ui] tests/ui/mismatched_types/int-float-type-mismatch.rs: [missing] -> pass (J1)
  • [ui] tests/ui/missing_debug_impls.rs: pass -> [missing] (J1)
  • [ui] tests/ui/mod-subitem-as-enum-variant.rs: pass -> [missing] (J1)
  • [ui] tests/ui/modules/nested-modules-basic.rs: [missing] -> pass (J1)
  • [ui] tests/ui/monomorphize-abi-alignment.rs: pass -> [missing] (J1)
  • [ui] tests/ui/msvc-opt-minsize.rs: ignore (only executed when the operating system is windows) -> [missing] (J1)
  • [ui] tests/ui/multiline-comment.rs: pass -> [missing] (J1)
  • [ui] tests/ui/parser/multiline-comments-basic.rs: [missing] -> pass (J1)
  • [ui] tests/ui/parser/unicode-multibyte-chars-no-ice.rs: [missing] -> pass (J1)
  • [ui] tests/ui/resolve/struct-function-same-name.rs: [missing] -> pass (J1)
  • [ui] tests/ui/resolve/type-param-local-var-shadowing.rs: [missing] -> pass (J1)
  • [ui] tests/ui/statics/static-generic-param-soundness.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/dispatch-from-dyn-invalid-impls.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/eval-caching-error-region.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/maybe-trait-bounds-forbidden-locations.rs: [missing] -> pass (J1)
  • [ui] tests/ui/type-alias-enum-variants/module-type-args-error.rs: [missing] -> pass (J1)
  • session_diagnostics::verify_attr_parsing_empty_confusables_33: pass -> [missing] (J3)
  • session_diagnostics::verify_attr_parsing_empty_confusables_34: [missing] -> pass (J3)
  • session_diagnostics::verify_attr_parsing_invalid_alignment_value_34: pass -> [missing] (J3)
  • session_diagnostics::verify_attr_parsing_naked_functions_incompatible_attribute_38: [missing] -> pass (J3)
  • session_diagnostics::verify_attr_parsing_null_on_link_section_32: [missing] -> pass (J3)
  • session_diagnostics::verify_attr_parsing_repr_ident_36: [missing] -> pass (J3)
  • session_diagnostics::verify_attr_parsing_stability_outside_std_32: pass -> [missing] (J3)
  • session_diagnostics::verify_attr_parsing_stability_outside_std_33: [missing] -> pass (J3)
  • session_diagnostics::verify_attr_parsing_unrecognized_repr_hint_36: pass -> [missing] (J3)
  • session_diagnostics::verify_attr_parsing_unrecognized_repr_hint_37: [missing] -> pass (J3)

Stage 2

  • [ui] tests/ui/attributes/inner-attrs-impl-cfg.rs: [missing] -> pass (J0)
  • [ui] tests/ui/codegen/maximal-hir-to-mir-coverage-flag.rs: [missing] -> pass (J0)
  • [ui] tests/ui/codegen/mono-respects-abi-alignment.rs: [missing] -> pass (J0)
  • [ui] tests/ui/compiletest-self-test/ui-test-missing-annotations-detection.rs: [missing] -> pass (J0)
  • [ui] tests/ui/derives/derive-Debug-enum-variants.rs: [missing] -> pass (J0)
  • [ui] tests/ui/fmt/debug-single-call.rs: [missing] -> pass (J0)
  • [ui] tests/ui/indexing/indexing-integral-types.rs: [missing] -> pass (J0)
  • [ui] tests/ui/inner-attrs-on-impl.rs: pass -> [missing] (J0)
  • [ui] tests/ui/inner-static-type-parameter.rs: pass -> [missing] (J0)
  • [ui] tests/ui/integral-indexing.rs: pass -> [missing] (J0)
  • [ui] tests/ui/integral-variable-unification-error.rs: pass -> [missing] (J0)
  • [ui] tests/ui/invalid_dispatch_from_dyn_impls.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issue-11881.rs: pass -> [missing] (J0)
  • [ui] tests/ui/lexical-scoping.rs: pass -> [missing] (J0)
  • [ui] tests/ui/link-section.rs: pass -> [missing] (J0)
  • [ui] tests/ui/linkage-attr/link-section-placement.rs: [missing] -> pass (J0)
  • [ui] tests/ui/lint/missing-debug-implementations-lint.rs: [missing] -> pass (J0)
  • [ui] tests/ui/log-err-phi.rs: pass -> [missing] (J0)
  • [ui] tests/ui/log-knows-the-names-of-variants.rs: pass -> [missing] (J0)
  • [ui] tests/ui/logging-only-prints-once.rs: pass -> [missing] (J0)
  • [ui] tests/ui/loud_ui.rs: pass -> [missing] (J0)
  • [ui] tests/ui/max-min-classes.rs: pass -> [missing] (J0)
  • [ui] tests/ui/maximal_mir_to_hir_coverage.rs: pass -> [missing] (J0)
  • [ui] tests/ui/maybe-bounds.rs: pass -> [missing] (J0)
  • [ui] tests/ui/method-output-diff-issue-127263.rs: pass -> [missing] (J0)
  • [ui] tests/ui/mismatched_types/fn-pointer-mismatch-diagnostics.rs: [missing] -> pass (J0)
  • [ui] tests/ui/mismatched_types/int-float-type-mismatch.rs: [missing] -> pass (J0)
  • [ui] tests/ui/missing_debug_impls.rs: pass -> [missing] (J0)
  • [ui] tests/ui/mod-subitem-as-enum-variant.rs: pass -> [missing] (J0)
  • [ui] tests/ui/modules/nested-modules-basic.rs: [missing] -> pass (J0)
  • [ui] tests/ui/monomorphize-abi-alignment.rs: pass -> [missing] (J0)
  • [ui] tests/ui/msvc-data-only.rs: pass -> [missing] (J0)
  • [ui] tests/ui/multibyte.rs: pass -> [missing] (J0)
  • [ui] tests/ui/multiline-comment.rs: pass -> [missing] (J0)
  • [ui] tests/ui/parser/multiline-comments-basic.rs: [missing] -> pass (J0)
  • [ui] tests/ui/parser/unicode-multibyte-chars-no-ice.rs: [missing] -> pass (J0)
  • [ui] tests/ui/resolve/struct-function-same-name.rs: [missing] -> pass (J0)
  • [ui] tests/ui/statics/static-generic-param-soundness.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/dispatch-from-dyn-invalid-impls.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/encoder-trait-bounds-regression.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/eval-caching-error-region.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/maybe-trait-bounds-forbidden-locations.rs: [missing] -> pass (J0)
  • [ui] tests/ui/type-alias-enum-variants/module-type-args-error.rs: [missing] -> pass (J0)
  • [ui] tests/ui/codegen/msvc-opt-level-z-no-corruption.rs: [missing] -> ignore (only executed when the operating system is windows) (J2)
  • [ui] tests/ui/msvc-opt-minsize.rs: ignore (only executed when the operating system is windows) -> [missing] (J2)
  • [ui] tests/ui/codegen/msvc-opt-level-z-no-corruption.rs: [missing] -> pass (J4)
  • [ui] tests/ui/msvc-opt-minsize.rs: pass -> [missing] (J4)
  • [rustdoc-json] tests/rustdoc-json/attrs/link_section_2021.rs: [missing] -> pass (J5)
  • [rustdoc-json] tests/rustdoc-json/attrs/link_section_2024.rs: [missing] -> pass (J5)
  • [run-make] tests/run-make/short-ice: pass -> ignore (ignored when the operating system and target environment are windows-msvc) (J6)
  • [run-make] tests/run-make/short-ice: ignore (ignored when the target is i686-pc-windows-msvc) -> ignore (ignored when the operating system and target environment are windows-msvc) (J7)

(and 19 additional test diffs)

Additionally, 198 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 c65dccabacdfd6c8a7f7439eba13422fdd89b91e --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-apple-1: 7243.8s -> 11009.0s (52.0%)
  2. dist-apple-various: 6258.5s -> 8764.3s (40.0%)
  3. dist-x86_64-apple: 8516.0s -> 10365.0s (21.7%)
  4. x86_64-rust-for-linux: 2636.5s -> 3164.3s (20.0%)
  5. x86_64-msvc-1: 8614.1s -> 10070.4s (16.9%)
  6. dist-aarch64-apple: 5694.3s -> 6529.0s (14.7%)
  7. mingw-check-1: 1586.0s -> 1802.2s (13.6%)
  8. dist-ohos-aarch64: 4807.9s -> 4181.6s (-13.0%)
  9. mingw-check-tidy: 75.2s -> 65.7s (-12.7%)
  10. i686-gnu-2: 5568.8s -> 6240.9s (12.1%)
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
#142429 tests/ui: A New Order [13/N] 7e9da8770cd693ce0ab7795a636ecd8644a1acb3 (link)
#142514 Miri: handling of SNaN inputs in f*::pow operations 2ab7620a910eec6853b5158fc4b34eba87b85381 (link)
#143066 Use let chains in the new solver 6ce6247bec2417e3c00a19c8acac1b4e560fe329 (link)
#143090 Workaround for memory unsafety in third party DLLs 9c9727a785b7c9b3d1d13466498a471dedb14dae (link)
#143118 tests/ui: A New Order [15/N] c9fa4ed47858b125405b141c4991707c2a74c078 (link)
#143159 Do not freshen ReError f6c8adbc053d740cee5468563600a6deccc50179 (link)
#143168 tests/ui: A New Order [16/N] d6e668510a0cafa5342b7c65caf4eaed315d7fdf (link)
#143176 fix typos and improve clarity in documentation f0d990ad7a9de6d97094ec2f4d4d4366e2b89aa4 (link)
#143187 Add my work email to mailmap a8858be8e82d0d9dd9242c386cd3c37c862b84ee (link)
#143190 Use the new method for BasicBlockData and Statement f3b7c5a37ed8662b647010456dd5875565e38eb3 (link)
#143195 tests/ui: A New Order [17/N] 359c9e406a897da05c5050abcbe9867485f3a365 (link)
#143196 Port #[link_section] to the new attribute parsing infrastru… 737774e3fd029545d1e87b0106c26e37941d3bef (link)
#143199 Re-disable tests/run-make/short-ice on Windows MSVC again 731a03c3f91c8a5033fab4206fae1dac421c2fed (link)
#143219 Show auto trait and blanket impls for ! 46b4aa71d3f333169e968cdcad960b63fdedbea7 (link)

previous master: ad3b725761

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 (c65dcca): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
0.4% [0.4%, 0.4%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.4% [0.4%, 0.4%] 1

Max RSS (memory usage)

Results (primary -0.3%, secondary -2.2%)

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

mean range count
Regressions ❌
(primary)
4.1% [1.0%, 7.3%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.4% [-3.2%, -1.0%] 4
Improvements ✅
(secondary)
-2.2% [-3.3%, -0.6%] 24
All ❌✅ (primary) -0.3% [-3.2%, 7.3%] 6

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: 694.099s -> 694.972s (0.13%)
Artifact size: 372.14 MiB -> 372.21 MiB (0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide A-rustdoc-json Area: Rustdoc JSON backend A-tidy Area: The tidy tool merged-by-bors This PR was explicitly merged by bors. O-windows Operating system: Windows 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-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-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.