Skip to content

Rollup of 8 pull requests #141824

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 20 commits into from
May 31, 2025
Merged

Rollup of 8 pull requests #141824

merged 20 commits into from
May 31, 2025

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented May 31, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

xizheyin and others added 20 commits May 24, 2025 16:33
Specifically `TyAlias`, `Enum`, `Struct`, `Union`. So the fields match
the textual order in the source code.

The interesting part of the change is in
`compiler/rustc_hir/src/hir.rs`. The rest is extremely mechanical
refactoring.
In `Fn`, put `ident` next to `generics` as is common in many other
types.

In `print_fn`, make the argument order match the printing order.
Includes the following changes:

* Enable `__powitf2` on MSVC [1]
* Update `CmpResult` to use a pointer-sized return type [2]
* Better code reuse between `libm` and `compiler-builtins` [3], [4]
* Stop building C versions of `__netf2` [5] since we have our own
  implementation

[1]: rust-lang/compiler-builtins#918
[2]: rust-lang/compiler-builtins#920
[3]: rust-lang/compiler-builtins#879
[4]: rust-lang/compiler-builtins#925
[5]: rust-lang/compiler-builtins#828
Note expr being cast when encounter NonScalar cast error

Fixes rust-lang#140491

I added note for `expr` so that it doesn't treat `&x as T` as `&(x as T)` but `(&x) as T`. But I'm not sure if I want to add note for all NonScalar, maybe for specific `expr_ty`?

r? compiler
…lacrum

std: note that `std::str::from_utf8*` functions are aliases to `<str>::from_utf8*` methods

Closes rust-lang#141079

r? libs
Document what `distcheck` is intended to exercise

Or at least attempt to.

Closes rust-lang#141387.

cc `@marcoieni` (re. [#t-infra/bootstrap > Speed up distcheck](https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Speed.20up.20distcheck/with/520208870))
r? `@Mark-Simulacrum` (as you may have some clues about if this is accurate)
…er, r=fee1-dead

Hir item kind field order

A follow-up to rust-lang#141675.

r? `@fee1-dead`
`tests/ui`: A New Order [1/N]

not sure if i should say something about changes here, just part of rust-lang#133895

but this is my very first time doing something like this, id love to keep contributing in this area later on, so any feedback is appreciated

also should say that im going to squash it after agreement on changes

r? `@jieyouxu`

mind if i name this PR series like "`tests/ui`: A New Order [N/N]", im not sure if it fits the project tone, so id like your approval first — but i think it sounds really neat (Star Wars reference)

this could be a first part :)
Update `compiler-builtins` to 0.1.160

Includes the following changes:

* Enable `__powitf2` on MSVC [1]
* Update `CmpResult` to use a pointer-sized return type [2]
* Better code reuse between `libm` and `compiler-builtins` [3], [4]
* Stop building C versions of `__netf2` [5] since we have our own implementation

[1]: rust-lang/compiler-builtins#918
[2]: rust-lang/compiler-builtins#920
[3]: rust-lang/compiler-builtins#879
[4]: rust-lang/compiler-builtins#925
[5]: rust-lang/compiler-builtins#828
…rs, r=workingjubilee

Enable non-leaf Frame Pointers for mingw-w64 Arm64 Windows

Based on rust-lang#140828

I don't have AArch64 Windows to test it, but I trust LLVM to handle it well.
…, r=jieyouxu

Fixes for building windows-gnullvm hosts

Split out from: rust-lang#140772
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) 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-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-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. rollup A PR which is a rollup labels May 31, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 31, 2025

📌 Commit 23cc24e 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 31, 2025
@bors
Copy link
Collaborator

bors commented May 31, 2025

⌛ Testing commit 23cc24e with merge 4d08223...

@bors
Copy link
Collaborator

bors commented May 31, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 31, 2025
@bors bors merged commit 4d08223 into rust-lang:master May 31, 2025
1 check passed
@rustbot rustbot added this to the 1.89.0 milestone May 31, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#140787 Note expr being cast when encounter NonScalar cast error 39e831e01668b0ec31d4a739e2435a66c88ee60a (link)
#141112 std: note that std::str::from_utf8* functions are aliases… 8df66b03c1b6b0b1753c08aa7cbd89ef4022b373 (link)
#141646 Document what distcheck is intended to exercise b7b6da0891c913eb7dacaf12c7b3d8c1daf6ae4d (link)
#141740 Hir item kind field order 146225103989e02cc540845eec0a95d1f0476bb1 (link)
#141793 tests/ui: A New Order [1/N] f6bfed8d0ae98a7df1c481ee383b8eff53f98e37 (link)
#141805 Update compiler-builtins to 0.1.160 29d3ddaf13894e300920a8721a104a492d7a7b75 (link)
#141815 Enable non-leaf Frame Pointers for mingw-w64 Arm64 Windows 7b8253a101aa1835a8d4724a46995b41eebb9e48 (link)
#141819 Fixes for building windows-gnullvm hosts 8944adc8197d3e222e37d5c433d6b6736401c782 (link)

previous master: 852f15c0f1

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
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 852f15c (parent) -> 4d08223 (this PR)

Test differences

Show 50 test diffs

Stage 1

  • [ui] tests/ui/auto-ref-slice-plus-ref.rs: pass -> [missing] (J1)
  • [ui] tests/ui/autoderef-full-lval.rs: pass -> [missing] (J1)
  • [ui] tests/ui/autoref-autoderef/autoderef-box-no-add.rs: [missing] -> pass (J1)
  • [ui] tests/ui/bare-fn-implements-fn-mut.rs: pass -> [missing] (J1)
  • [ui] tests/ui/bare-static-string.rs: pass -> [missing] (J1)
  • [ui] tests/ui/big-literals.rs: pass -> [missing] (J1)
  • [ui] tests/ui/cast/func-pointer-issue-140491.rs: [missing] -> pass (J1)
  • [ui] tests/ui/functions-closures/bare-fn-implements-fn-mut.rs: [missing] -> pass (J1)
  • [ui] tests/ui/lint/overflowing-literals-valid.rs: [missing] -> pass (J1)
  • [ui] tests/ui/methods/vec-autoderef-autoref.rs: [missing] -> pass (J1)
  • [ui] tests/ui/str/str-static-literal.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/auto-ref-slice-plus-ref.rs: pass -> [missing] (J0)
  • [ui] tests/ui/autoderef-full-lval.rs: pass -> [missing] (J0)
  • [ui] tests/ui/autoref-autoderef/autoderef-box-no-add.rs: [missing] -> pass (J0)
  • [ui] tests/ui/bare-fn-implements-fn-mut.rs: pass -> [missing] (J0)
  • [ui] tests/ui/bare-static-string.rs: pass -> [missing] (J0)
  • [ui] tests/ui/big-literals.rs: pass -> [missing] (J0)
  • [ui] tests/ui/cast/func-pointer-issue-140491.rs: [missing] -> pass (J0)
  • [ui] tests/ui/functions-closures/bare-fn-implements-fn-mut.rs: [missing] -> pass (J0)
  • [ui] tests/ui/lint/overflowing-literals-valid.rs: [missing] -> pass (J0)
  • [ui] tests/ui/methods/vec-autoderef-autoref.rs: [missing] -> pass (J0)
  • [ui] tests/ui/str/str-static-literal.rs: [missing] -> pass (J0)

Additionally, 28 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 4d08223c054cf5a56d9761ca925fd46ffebe7115 --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: 5682.4s -> 7977.2s (40.4%)
  2. x86_64-apple-2: 6305.4s -> 3869.9s (-38.6%)
  3. dist-x86_64-apple: 8932.7s -> 7510.2s (-15.9%)
  4. aarch64-apple: 5153.1s -> 4583.6s (-11.1%)
  5. x86_64-apple-1: 8183.3s -> 7436.7s (-9.1%)
  6. dist-x86_64-freebsd: 5321.2s -> 4906.0s (-7.8%)
  7. x86_64-gnu-llvm-20-2: 6479.1s -> 6053.3s (-6.6%)
  8. dist-i686-msvc: 6911.9s -> 7269.2s (5.2%)
  9. dist-aarch64-apple: 5681.6s -> 5459.8s (-3.9%)
  10. x86_64-msvc-2: 6689.2s -> 6893.7s (3.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

Finished benchmarking commit (4d08223): 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.3%, 0.3%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary 0.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)
0.7% [0.5%, 1.0%] 6
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.9% [-1.1%, -0.8%] 3
All ❌✅ (primary) - - 0

Cycles

Results (secondary 0.2%)

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)
1.0% [0.4%, 2.8%] 7
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.9% [-1.4%, -0.4%] 5
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 776.679s -> 776.152s (-0.07%)
Artifact size: 372.27 MiB -> 372.23 MiB (-0.01%)

github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Jun 3, 2025
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#140787 (Note expr being cast when encounter NonScalar cast error)
 - rust-lang#141112 (std: note that `std::str::from_utf8*` functions are aliases to `<str>::from_utf8*` methods)
 - rust-lang#141646 (Document what `distcheck` is intended to exercise)
 - rust-lang#141740 (Hir item kind field order)
 - rust-lang#141793 (`tests/ui`: A New Order [1/N])
 - rust-lang#141805 (Update `compiler-builtins` to 0.1.160)
 - rust-lang#141815 (Enable non-leaf Frame Pointers for mingw-w64 Arm64 Windows)
 - rust-lang#141819 (Fixes for building windows-gnullvm hosts)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) 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-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-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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants