Skip to content

Rollup of 8 pull requests #142142

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

Rollup of 8 pull requests #142142

merged 17 commits into from
Jun 7, 2025

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Jun 7, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Diggsey and others added 17 commits May 26, 2025 23:29
…s` option

Prior to this change, cgu names could be generated which would result in
filenames longer than the limit imposed by the OS.
Apple targets can now overriding this configuration and instead use the
default based on their architecture, which means aarch64 targets now
have less frame pointers in leaf functions.
```
error[E0604]: only `u8` can be cast as `char`, not `u32`
  --> $DIR/E0604.rs:2:5
   |
LL |     1u32 as char;
   |     ^^^^^^^^^^^^ invalid cast
   |
help: try `char::from_u32` instead
   |
LL -     1u32 as char;
LL +     char::from_u32(1u32);
   |
```

```
error[E0620]: cast to unsized type: `&[u8]` as `[char]`
  --> $DIR/cast-to-slice.rs:6:5
   |
LL |     arr as [char];
   |     ^^^^^^^^^^^^^
   |
help: try casting to a reference instead
   |
LL |     arr as &[char];
   |            +
```

```
error[E0620]: cast to unsized type: `Box<{integer}>` as `dyn Send`
  --> $DIR/cast-to-unsized-trait-object-suggestion.rs:3:5
   |
LL |     Box::new(1) as dyn Send;
   |     ^^^^^^^^^^^^^^^^^^^^^^^
   |
help: you can cast to a `Box` instead
   |
LL |     Box::new(1) as Box<dyn Send>;
   |                    ++++        +
```
```
error[E0277]: `()` is not a future
  --> $DIR/unnecessary-await.rs:28:10
   |
LL |     e!().await;
   |          ^^^^^ `()` is not a future
   |
   = help: the trait `Future` is not implemented for `()`
   = note: () must be a future or must implement `IntoFuture` to be awaited
   = note: required for `()` to implement `IntoFuture`
help: remove the `.await`
   |
LL -     e!().await;
LL +     e!();
   |
```
```
error[E0277]: the trait bound `String: Copy` is not satisfied
  --> $DIR/const-fn-in-vec.rs:1:47
   |
LL | static _MAYBE_STRINGS: [Option<String>; 5] = [None; 5];
   |                                               ^^^^ the trait `Copy` is not implemented for `String`
   |
   = note: required for `Option<String>` to implement `Copy`
   = note: the `Copy` trait is required because this value will be copied for each element of the array
help: create an inline `const` block
   |
LL | static _MAYBE_STRINGS: [Option<String>; 5] = [const { None }; 5];
   |                                               +++++++      +
```
…_pathbuf_leak, r=dtolnay

Stabilise `os_string_pathbuf_leak`

This PR stabilises `#[feature(os_string_pathbuf_leak)]`, which defines 2 new methods in the std:

```rs
impl OsString {
    pub fn leak<'a>(self) -> &'a mut OsStr;
}

impl PathBuf {
    pub fn leak<'a>(self) -> &'a mut Path;
}
```

ACP: rust-lang/libs-team#389
Tracking issue: rust-lang#125965
Implementation: rust-lang#125966
…r=matthewjasper

Limit the size of cgu names when using the `-Zhuman-readable-cgu-name…

…s` option

Prior to this change, cgu names could be generated which would result in filenames longer than the limit imposed by the OS.
…ointers-but-not-that-much, r=madsmtm

compiler: set Apple frame pointers by architecture

All Apple targets stop overriding this configuration and instead use the default base of FramePointer::NonLeaf, which means some Apples will have less frame pointers in leaf functions.

r? ``@madsmtm``

cc ``@thomcc``
coretests: move float tests from num to floats module and use a more flexible macro to generate them

This makes some progress on rust-lang#141726 by moving the float tests in `num` to `floats` and using a newer, more flexible macro to generate them. We also newly run these tests on f16 and f128 in const, and at runtime in Miri and for hosts where that works well enough.

I didn't yet deduplicate any tests or port the existing `floats::f*` tests to the macro, that can happen in a future PR.

try-job: x86_64-gnu-aux
…gestion, r=compiler-errors

Make obligation cause code suggestions verbose

```
error[E0277]: `()` is not a future
  --> $DIR/unnecessary-await.rs:28:10
   |
LL |     e!().await;
   |          ^^^^^ `()` is not a future
   |
   = help: the trait `Future` is not implemented for `()`
   = note: () must be a future or must implement `IntoFuture` to be awaited
   = note: required for `()` to implement `IntoFuture`
help: remove the `.await`
   |
LL -     e!().await;
LL +     e!();
   |
```
```
error[E0277]: the trait bound `String: Copy` is not satisfied
  --> $DIR/const-fn-in-vec.rs:1:47
   |
LL | static _MAYBE_STRINGS: [Option<String>; 5] = [None; 5];
   |                                               ^^^^ the trait `Copy` is not implemented for `String`
   |
   = note: required for `Option<String>` to implement `Copy`
   = note: the `Copy` trait is required because this value will be copied for each element of the array
help: create an inline `const` block
   |
LL | static _MAYBE_STRINGS: [Option<String>; 5] = [const { None }; 5];
   |                                               +++++++      +
```

Part of rust-lang#141973
Check documentation of bootstrap in PR CI

It's annoying when wrong doc comments in bootstrap [break](rust-lang#141272 (comment)) `auto` CI. This has happened a few times recently, and documenting bootstrap with the stage0 compiler should be pretty quick, so let's add it to PR CI.

r? ``@marcoieni``
…oieni

Add solaris targets to build-manifest

this is follow up for: rust-lang#138699
Make cast suggestions verbose

```
error[E0604]: only `u8` can be cast as `char`, not `u32`
  --> $DIR/E0604.rs:2:5
   |
LL |     1u32 as char;
   |     ^^^^^^^^^^^^ invalid cast
   |
help: try `char::from_u32` instead
   |
LL -     1u32 as char;
LL +     char::from_u32(1u32);
   |
```

```
error[E0620]: cast to unsized type: `&[u8]` as `[char]`
  --> $DIR/cast-to-slice.rs:6:5
   |
LL |     arr as [char];
   |     ^^^^^^^^^^^^^
   |
help: try casting to a reference instead
   |
LL |     arr as &[char];
   |            +
```

```
error[E0620]: cast to unsized type: `Box<{integer}>` as `dyn Send`
  --> $DIR/cast-to-unsized-trait-object-suggestion.rs:3:5
   |
LL |     Box::new(1) as dyn Send;
   |     ^^^^^^^^^^^^^^^^^^^^^^^
   |
help: you can cast to a `Box` instead
   |
LL |     Box::new(1) as Box<dyn Send>;
   |                    ++++        +
```

Part of rust-lang#141973.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) 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. rollup A PR which is a rollup labels Jun 7, 2025
@jhpratt
Copy link
Member Author

jhpratt commented Jun 7, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jun 7, 2025

📌 Commit fb6977c has been approved by jhpratt

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

bors commented Jun 7, 2025

⌛ Testing commit fb6977c with merge c57119b...

@bors
Copy link
Collaborator

bors commented Jun 7, 2025

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing c57119b to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#137992 Stabilise os_string_pathbuf_leak 0ded11fe28d7e4e0d1e1465779c8b3ade6da3ef5 (link)
#141558 Limit the size of cgu names when using the `-Zhuman-readabl… 3a3f50e6fdd1a13b045511719379fc16a7a75bd3 (link)
#141797 compiler: set Apple frame pointers by architecture 87953ef64d89e8405a54d388a935f9bbfeb5871b (link)
#141857 coretests: move float tests from num to floats module and u… ae299aa766f4ca904a21ea5c0d09ee78b1d69955 (link)
#142045 Make obligation cause code suggestions verbose 2caa2a79cb44da4f718d177fba3f83352fbcd6b1 (link)
#142076 Check documentation of bootstrap in PR CI 45c8c8c5f829767c7bd2e094dd370cd528ea4ddf (link)
#142110 Add solaris targets to build-manifest 36571dd0e4bb935ac8d5d3affc877be6d5e7cbf3 (link)
#142131 Make cast suggestions verbose 9067619e61832e7dc7277ab7f2eb5c4062ef9537 (link)

previous master: 1dc9ae6d10

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

github-actions bot commented Jun 7, 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 1dc9ae6 (parent) -> c57119b (this PR)

Test differences

Show 178 test diffs

Stage 1

  • floats::abs::const_::test_f128: [missing] -> pass (J0)
  • floats::abs::const_::test_f16: [missing] -> pass (J0)
  • floats::abs::const_::test_f64: [missing] -> pass (J0)
  • floats::abs::test_f32: [missing] -> pass (J0)
  • floats::ceil::const_::test_f128: [missing] -> pass (J0)
  • floats::ceil::const_::test_f16: [missing] -> pass (J0)
  • floats::ceil::const_::test_f64: [missing] -> pass (J0)
  • floats::ceil::test_f64: [missing] -> pass (J0)
  • floats::copysign::const_::test_f32: [missing] -> pass (J0)
  • floats::div_euclid::test_f64: [missing] -> pass (J0)
  • floats::floor::const_::test_f128: [missing] -> pass (J0)
  • floats::floor::const_::test_f16: [missing] -> pass (J0)
  • floats::floor::const_::test_f32: [missing] -> pass (J0)
  • floats::floor::const_::test_f64: [missing] -> pass (J0)
  • floats::fract::const_::test_f128: [missing] -> pass (J0)
  • floats::fract::const_::test_f16: [missing] -> pass (J0)
  • floats::fract::const_::test_f32: [missing] -> pass (J0)
  • floats::fract::test_f32: [missing] -> pass (J0)
  • floats::fract::test_f64: [missing] -> pass (J0)
  • floats::max::const_::test_f128: [missing] -> pass (J0)
  • floats::max::const_::test_f16: [missing] -> pass (J0)
  • floats::max::const_::test_f32: [missing] -> pass (J0)
  • floats::max::test_f32: [missing] -> pass (J0)
  • floats::max::test_f64: [missing] -> pass (J0)
  • floats::maximum::const_::test_f32: [missing] -> pass (J0)
  • floats::maximum::const_::test_f64: [missing] -> pass (J0)
  • floats::maximum::test_f32: [missing] -> pass (J0)
  • floats::midpoint::const_::test_f64: [missing] -> pass (J0)
  • floats::midpoint::test_f64: [missing] -> pass (J0)
  • floats::min::const_::test_f128: [missing] -> pass (J0)
  • floats::min::const_::test_f16: [missing] -> pass (J0)
  • floats::min::const_::test_f32: [missing] -> pass (J0)
  • floats::min::const_::test_f64: [missing] -> pass (J0)
  • floats::min::test_f32: [missing] -> pass (J0)
  • floats::min::test_f64: [missing] -> pass (J0)
  • floats::minimum::const_::test_f32: [missing] -> pass (J0)
  • floats::minimum::test_f32: [missing] -> pass (J0)
  • floats::round::const_::test_f128: [missing] -> pass (J0)
  • floats::round::const_::test_f32: [missing] -> pass (J0)
  • floats::round::const_::test_f64: [missing] -> pass (J0)
  • floats::round::test_f32: [missing] -> pass (J0)
  • floats::round_ties_even::const_::test_f128: [missing] -> pass (J0)
  • floats::round_ties_even::const_::test_f32: [missing] -> pass (J0)
  • floats::round_ties_even::const_::test_f64: [missing] -> pass (J0)
  • floats::trunc::const_::test_f16: [missing] -> pass (J0)
  • floats::trunc::const_::test_f64: [missing] -> pass (J0)
  • floats::trunc::test_f32: [missing] -> pass (J0)
  • floats::trunc::test_f64: [missing] -> pass (J0)
  • num::f32::ceil: pass -> [missing] (J0)
  • num::f32::floor: pass -> [missing] (J0)
  • num::f32::fract: pass -> [missing] (J0)
  • num::f32::min: pass -> [missing] (J0)
  • num::f32::rem_euclid: pass -> [missing] (J0)
  • num::f32::round_ties_even: pass -> [missing] (J0)
  • num::f32_const::ceil: pass -> [missing] (J0)
  • num::f32_const::copysign: pass -> [missing] (J0)
  • num::f32_const::floor: pass -> [missing] (J0)
  • num::f32_const::fract: pass -> [missing] (J0)
  • num::f32_const::maximum: pass -> [missing] (J0)
  • num::f32_const::midpoint: pass -> [missing] (J0)
  • num::f32_const::minimum: pass -> [missing] (J0)
  • num::f32_const::round: pass -> [missing] (J0)
  • num::f32_const::round_ties_even: pass -> [missing] (J0)
  • num::f32_const::trunc: pass -> [missing] (J0)
  • num::f64::ceil: pass -> [missing] (J0)
  • num::f64::fract: pass -> [missing] (J0)
  • num::f64::midpoint: pass -> [missing] (J0)
  • num::f64::min: pass -> [missing] (J0)
  • num::f64::rem_euclid: pass -> [missing] (J0)
  • num::f64::round: pass -> [missing] (J0)
  • num::f64::round_ties_even: pass -> [missing] (J0)
  • num::f64_const::abs: pass -> [missing] (J0)
  • num::f64_const::ceil: pass -> [missing] (J0)
  • num::f64_const::fract: pass -> [missing] (J0)
  • num::f64_const::max: pass -> [missing] (J0)
  • num::f64_const::maximum: pass -> [missing] (J0)
  • num::f64_const::midpoint: pass -> [missing] (J0)
  • num::f64_const::min: pass -> [missing] (J0)
  • num::f64_const::minimum: pass -> [missing] (J0)
  • num::f64_const::rem_euclid: pass -> [missing] (J0)
  • num::f64_const::round_ties_even: pass -> [missing] (J0)
  • num::f64_const::trunc: pass -> [missing] (J0)
  • floats::ceil::test_f16: [missing] -> pass (J1)
  • floats::copysign::test_f16: [missing] -> pass (J1)
  • floats::div_euclid::test_f16: [missing] -> pass (J1)
  • floats::fract::test_f16: [missing] -> pass (J1)
  • floats::max::test_f16: [missing] -> pass (J1)
  • floats::midpoint::test_f16: [missing] -> pass (J1)
  • floats::min::test_f16: [missing] -> pass (J1)
  • floats::minimum::test_f16: [missing] -> pass (J1)
  • floats::rem_euclid::test_f16: [missing] -> pass (J1)
  • floats::round::test_f16: [missing] -> pass (J1)
  • floats::trunc::test_f16: [missing] -> pass (J1)
  • floats::abs::test_f128: [missing] -> pass (J2)
  • floats::ceil::test_f128: [missing] -> pass (J2)
  • floats::copysign::test_f128: [missing] -> pass (J2)
  • floats::floor::test_f128: [missing] -> pass (J2)
  • floats::minimum::test_f128: [missing] -> pass (J2)
  • floats::round_ties_even::test_f128: [missing] -> pass (J2)
  • floats::trunc::test_f128: [missing] -> pass (J2)

(and 76 additional test diffs)

Additionally, 2 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 c57119b9a1c86968188bb9703a7859c17f8bc71c --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-2: 5237.1s -> 4244.2s (-19.0%)
  2. x86_64-apple-1: 6687.6s -> 7822.3s (17.0%)
  3. x86_64-rust-for-linux: 2541.8s -> 2964.8s (16.6%)
  4. x86_64-gnu-llvm-19-1: 3210.7s -> 3688.1s (14.9%)
  5. x86_64-gnu-debug: 5205.6s -> 5801.9s (11.5%)
  6. i686-gnu-2: 5349.4s -> 5920.4s (10.7%)
  7. aarch64-gnu-debug: 3591.7s -> 3969.5s (10.5%)
  8. armhf-gnu: 4377.3s -> 4831.2s (10.4%)
  9. i686-gnu-nopt-1: 7155.7s -> 7872.9s (10.0%)
  10. dist-aarch64-linux: 6329.2s -> 5726.9s (-9.5%)
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.

@jhpratt jhpratt deleted the rollup-frlezq2 branch June 7, 2025 09:30
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c57119b): 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 -1.0%, secondary 1.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.2% [1.2%, 1.2%] 1
Improvements ✅
(primary)
-1.0% [-1.0%, -1.0%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.0% [-1.0%, -1.0%] 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: 753.755s -> 753.381s (-0.05%)
Artifact size: 372.47 MiB -> 372.54 MiB (0.02%)

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. O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.