Skip to content

Rollup of 5 pull requests #139154

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 11 commits into from
Mar 31, 2025
Merged

Rollup of 5 pull requests #139154

merged 11 commits into from
Mar 31, 2025

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Mar 30, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

thaliaarchi and others added 11 commits March 28, 2025 14:45
Before:

    let a =
        StructWithSomeFields{
            field_1: 1,

            field_2: 2,

            field_3: 3,

            field_4: 4,

            field_5: 5,

            field_6: 6,};

    let a = StructWithSomeFields{ field_1: 1,  field_2: 2, ..a};

After:

    let a =
        StructWithSomeFields {
            field_1: 1,
            field_2: 2,
            field_3: 3,
            field_4: 4,
            field_5: 5,
            field_6: 6 };

    let a = StructWithSomeFields { field_1: 1, field_2: 2, ..a };
…one, r=onur-ozkan

bootstrap: Avoid cloning `change-id` list

Inspired by [recent discussion](https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Collecting.20some.20Real.20Configs.20for.20testing/near/507845657) on the bootstrap `change-id` field, I took a look at the code and found this little optimization. It does not change behavior.
…rors

Remove attribute `#[rustc_error]`

It was an ancient way to write `check-pass` tests, but now it's no longer necessary (except for the `delayed_bug_from_inside_query` flavor, which is retained).
…iler-errors

Improve hir_pretty for struct expressions.

While working on rust-lang#139131 I noticed the hir pretty printer outputs an empty line between each field, and is also missing a space before the `{` and the `}`:

```rust
    let a =
        StructWithSomeFields{
            field_1: 1,

            field_2: 2,

            field_3: 3,

            field_4: 4,

            field_5: 5,

            field_6: 6,};

    let a = StructWithSomeFields{ field_1: 1,  field_2: 2, ..a};
```

This changes it to:

```rust
    let a =
        StructWithSomeFields {
            field_1: 1,
            field_2: 2,
            field_3: 3,
            field_4: 4,
            field_5: 5,
            field_6: 6 };

    let a = StructWithSomeFields { field_1: 1, field_2: 2, ..a };
```
Switch some rustc_on_unimplemented uses to diagnostic::on_unimplemented

The use on the SliceIndex impl appears unreachable, there is no mention of "vector indices" in any test output and I could not get it to show up in error messages.
@rustbot rustbot added 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. rollup A PR which is a rollup labels Mar 30, 2025
@jhpratt
Copy link
Member Author

jhpratt commented Mar 30, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Mar 30, 2025

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

bors commented Mar 31, 2025

⌛ Testing commit a99b533 with merge 3c0f722...

@bors
Copy link
Collaborator

bors commented Mar 31, 2025

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

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#139044 bootstrap: Avoid cloning change-id list 2b1b2acc0bdd3e3cffa20c74afbb9a0a3290b29c (link)
#139111 Properly document FakeReads 06cbb3f2e03a7b69183c81c3122513dab201d480 (link)
#139122 Remove attribute #[rustc_error] 07cae9f28d308241471130a8916923bc5731f811 (link)
#139132 Improve hir_pretty for struct expressions. 4e94ce113175b31d6496c93c7ba4e78a041eca87 (link)
#139141 Switch some rustc_on_unimplemented uses to diagnostic::on_u… da4a4e5612cf37246bbc29b2c8339952a87f5929 (link)

previous master: 2ea33b5910

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 2ea33b5 (parent) -> 3c0f722 (this PR)

Test differences

Show 109 test diffs

Stage 1

  • errors::verify_interface_abi_required_feature_17: [missing] -> pass (J1)
  • errors::verify_interface_abi_required_feature_19: pass -> [missing] (J1)
  • errors::verify_interface_failed_writing_file_11: [missing] -> pass (J1)
  • errors::verify_interface_failed_writing_file_13: pass -> [missing] (J1)
  • errors::verify_interface_ignoring_extra_filename_14: [missing] -> pass (J1)
  • errors::verify_interface_ignoring_extra_filename_16: pass -> [missing] (J1)
  • errors::verify_interface_ignoring_out_dir_15: [missing] -> pass (J1)
  • errors::verify_interface_ignoring_out_dir_17: pass -> [missing] (J1)
  • errors::verify_interface_limit_invalid_18: [missing] -> pass (J1)
  • errors::verify_interface_limit_invalid_20: pass -> [missing] (J1)
  • errors::verify_interface_multiple_output_types_adaption_13: [missing] -> pass (J1)
  • errors::verify_interface_multiple_output_types_adaption_15: pass -> [missing] (J1)
  • errors::verify_interface_multiple_output_types_to_stdout_16: [missing] -> pass (J1)
  • errors::verify_interface_multiple_output_types_to_stdout_18: pass -> [missing] (J1)
  • errors::verify_interface_proc_macro_crate_panic_abort_12: [missing] -> pass (J1)
  • errors::verify_interface_proc_macro_crate_panic_abort_14: pass -> [missing] (J1)
  • errors::verify_interface_rustc_error_fatal_11: pass -> [missing] (J1)
  • errors::verify_interface_rustc_error_unexpected_annotation_12: pass -> [missing] (J1)
  • [pretty] tests/pretty/hir-struct-expr.rs: [missing] -> pass (J3)
  • [ui] tests/ui/rustc-error.rs: pass -> [missing] (J3)

Stage 2

  • [pretty] tests/pretty/hir-struct-expr.rs: [missing] -> pass (J0)
  • [ui] tests/ui/rustc-error.rs: pass -> [missing] (J2)

Additionally, 87 doctest diffs were found. These are ignored, as they are noisy.

Job group index

  • J0: aarch64-apple, aarch64-gnu, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, x86_64-apple-1, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
  • J1: aarch64-apple, aarch64-gnu, i686-gnu-2, i686-gnu-nopt-2, i686-mingw-2, i686-mingw-3, i686-msvc-2, x86_64-apple-1, x86_64-gnu, x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-3, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-2, x86_64-msvc-2
  • J2: aarch64-apple, aarch64-gnu, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-apple-2, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
  • J3: x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-3

Job duration changes

  1. x86_64-apple-1: 7211.3s -> 8523.6s (18.2%)
  2. aarch64-gnu: 9244.5s -> 10455.6s (13.1%)
  3. dist-aarch64-apple: 4858.3s -> 5462.4s (12.4%)
  4. x86_64-gnu: 6292.3s -> 6835.0s (8.6%)
  5. x86_64-msvc-ext2: 5775.9s -> 6118.3s (5.9%)
  6. i686-mingw-2: 6527.5s -> 6863.5s (5.1%)
  7. dist-apple-various: 6755.6s -> 7029.6s (4.1%)
  8. dist-powerpc-linux: 5247.5s -> 5442.1s (3.7%)
  9. x86_64-gnu-stable: 6376.4s -> 6582.6s (3.2%)
  10. x86_64-gnu-llvm-19-3: 6585.1s -> 6788.3s (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 (3c0f722): 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.2%, secondary -1.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.2% [1.7%, 2.8%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.1% [-1.1%, -1.1%] 1
All ❌✅ (primary) 2.2% [1.7%, 2.8%] 2

Cycles

Results (secondary -3.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)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.2% [-3.7%, -2.5%] 6
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 776.873s -> 776.099s (-0.10%)
Artifact size: 365.88 MiB -> 365.92 MiB (0.01%)

github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Apr 2, 2025
Rollup of 5 pull requests

Successful merges:

 - rust-lang#139044 (bootstrap: Avoid cloning `change-id` list)
 - rust-lang#139111 (Properly document FakeReads)
 - rust-lang#139122 (Remove attribute `#[rustc_error]`)
 - rust-lang#139132 (Improve hir_pretty for struct expressions.)
 - rust-lang#139141 (Switch some rustc_on_unimplemented uses to diagnostic::on_unimplemented)

r? `@ghost`
`@rustbot` modify labels: rollup
@jhpratt jhpratt deleted the rollup-rv8f915 branch May 29, 2025 20:56
# for free to join this conversation on GitHub. Already have an account? # 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-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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants