Skip to content

Rollup of 3 pull requests #144723

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 16 commits into from
Jul 31, 2025
Merged

Rollup of 3 pull requests #144723

merged 16 commits into from
Jul 31, 2025

Conversation

Zalathar
Copy link
Contributor

@Zalathar Zalathar commented Jul 31, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

scottmcm and others added 16 commits July 29, 2025 20:41
It's not used in `rustc_middle`, and `rustc_resolve` is a better place
for it.
It's not used in `rustc_middle`, and `rustc_trait_selection` is a better
place for it.
Next to all the other `EarlyParamRegion` pieces.
It's only used in `rustc_hir_typeck`.
It's only used in `rustc_infer`.
The fields are public, so this doesn't need a method, normal
deconstruction and/or field access is good enough.
It's identical to `TyCtxt::get_all_attrs` except it takes `DefId`
instead of `impl Into<DefIf>`.
It's only used in `rustc_hir_typeck`.
- Put them in the module that defines the type.
- Add some `WithCachedTypeInfo<T>` asserts for consistency.
… r=fee1-dead

fix: Only "close the window" when its the last annotated file

While comparing the Unicode theme output of `rustc` and `annotate-snippets`, I found that `rustc` would ["close the window"](https://github.com/rust-lang/rust/blob/686bc1c5f9c06762b18082434c04d514acf6707e/compiler/rustc_errors/src/emitter.rs#L1025-L1027) (draw a `╰╴`), even though there were other annotated files that followed the current one. This PR makes it so the emitter will only "close the window" on the last annotated file.

Before:
```
error[E0624]: method `method` is private
   ╭▸ $DIR/close_window.rs:9:7
   │
LL │     s.method();
   ╰╴      ━━━━━━ private method
   │
   ⸬ $DIR/auxiliary/close_window.rs:3:5
   │
LL │     fn method(&self) {}
   ╰╴    ──────────────── private method defined here
```

After:
```
error[E0624]: method `method` is private
   ╭▸ $DIR/close_window.rs:9:7
   │
LL │     s.method();
   │       ━━━━━━ private method
   │
   ⸬ $DIR/auxiliary/close_window.rs:3:5
   │
LL │     fn method(&self) {}
   ╰╴    ──────────────── private method defined here
```
…r=compiler-errors

Re-block SRoA on SIMD types

Fixes rust-lang#144621
…ps, r=lcnr

`rustc_middle::ty` cleanups

r? `@davidtwco`
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler 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 Jul 31, 2025
@Zalathar
Copy link
Contributor Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jul 31, 2025

📌 Commit 017586c has been approved by Zalathar

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

bors commented Jul 31, 2025

⌛ Testing commit 017586c with merge 64ca23b...

@bors
Copy link
Collaborator

bors commented Jul 31, 2025

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing 64ca23b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 31, 2025
@bors bors merged commit 64ca23b into rust-lang:master Jul 31, 2025
11 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 31, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#144657 fix: Only "close the window" when its the last annotated fi… 0f84b830c32c930dd502bdbd73a3ab75c41942d5 (link)
#144665 Re-block SRoA on SIMD types eed7cb8ad3f941ae35cbd761cbdcf2181f904b0d (link)
#144713 rustc_middle::ty cleanups 1f819b3590e7a53dbd7d5c797b2fc38a14e830ff (link)

previous master: cc0a5b7305

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 cc0a5b7 (parent) -> 64ca23b (this PR)

Test differences

Show 26 test diffs

Stage 1

  • [mir-opt] tests/mir-opt/sroa/simd_sroa.rs: [missing] -> pass (J0)
  • [ui] tests/ui/error-emitter/close_window.rs#ascii: [missing] -> pass (J0)
  • [ui] tests/ui/error-emitter/close_window.rs#unicode: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/error-emitter/close_window.rs#ascii: [missing] -> pass (J1)
  • [ui] tests/ui/error-emitter/close_window.rs#unicode: [missing] -> pass (J1)
  • [mir-opt] tests/mir-opt/sroa/simd_sroa.rs: [missing] -> pass (J2)

Additionally, 20 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 64ca23b6235732fa61c0a2b957c5d7e591e7c972 --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: 7293.9s -> 4137.9s (-43.3%)
  2. aarch64-apple: 4450.5s -> 6292.8s (41.4%)
  3. x86_64-apple-1: 6397.5s -> 8412.7s (31.5%)
  4. dist-aarch64-apple: 7047.3s -> 5029.2s (-28.6%)
  5. dist-x86_64-windows-gnullvm: 7234.0s -> 5591.3s (-22.7%)
  6. x86_64-gnu-llvm-19: 2999.7s -> 2723.6s (-9.2%)
  7. dist-x86_64-apple: 10617.4s -> 9663.1s (-9.0%)
  8. dist-aarch64-msvc: 4976.2s -> 5374.1s (8.0%)
  9. x86_64-gnu-llvm-19-1: 3459.5s -> 3735.3s (8.0%)
  10. dist-aarch64-linux: 6001.1s -> 5560.6s (-7.3%)
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.

@Zalathar Zalathar deleted the rollup-f9e0rfo branch July 31, 2025 12:40
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (64ca23b): 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
Regressions ❌
(secondary)
0.1% [0.1%, 0.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary -4.3%)

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

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

Cycles

Results (primary 0.1%, secondary -7.0%)

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

mean range count
Regressions ❌
(primary)
2.3% [2.3%, 2.3%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.2% [-2.2%, -2.2%] 1
Improvements ✅
(secondary)
-7.0% [-9.6%, -4.4%] 2
All ❌✅ (primary) 0.1% [-2.2%, 2.3%] 2

Binary size

Results (secondary -0.0%)

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

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

Bootstrap: 468.739s -> 467.836s (-0.19%)
Artifact size: 376.79 MiB -> 376.81 MiB (0.00%)

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-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler 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.

7 participants