Skip to content

Rollup of 2 pull requests - #144882

Merged
bors merged 5 commits into
rust-lang:masterfrom
Zalathar:rollup-i5q32em
Aug 4, 2025
Merged

Rollup of 2 pull requests#144882
bors merged 5 commits into
rust-lang:masterfrom
Zalathar:rollup-i5q32em

Conversation

@Zalathar

@ZalatharZalathar commented Aug 4, 2025•
edited by rustbot
Loading

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errorsand others added 5 commits July 30, 2025 17:48
@compiler-errors
Distinguish appending and replacing self ty in predicates
2ae048e
@scottmcm
Add a mir-opt test for *debug* MIR from derive(PartialOrd, Ord)
c441640
Because the follow-up commits will affect it, and the goal is to show how.
@scottmcm
Add a debug-mode MIR pre-codegen test for ?-on-Option
e1a38ec
@Zalathar
Rollup merge ofrust-lang#144694- compiler-errors:with-self-ty, r=Sp…
7307dc0
…arrowLii
Distinguish prepending and replacing self ty in predicates
There are two kinds of functions called `with_self_ty`:
1. Prepends the `Self` type onto an `ExistentialPredicate` which lacks it in its internal representation.
2. Replaces the `Self` type of an existing predicate, either for diagnostics purposes or in the new trait solver when normalizing that self type.
This PR distinguishes these two because I often want to only grep for one of them. Namely, let's call it `with_replaced_self_ty` when all we're doing is replacing the self type.
@Zalathar
Rollup merge ofrust-lang#144875- scottmcm:more-mir-tests, r=cjgillot
fe644eb
Add some pre-codegen MIR tests for debug mode
No functional changes; just some tests.
I made these for rust-lang#144483, but that's going in a different direction, so I wanted to propose we just add them to help see the impact of other related changes in the future.
r? mir
@rustbotrustbot 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Aug 4, 2025
@Zalathar

Zalathar commented Aug 4, 2025

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Aug 4, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit fe644eb has been approved by Zalathar

It is now in the queue for this repository.

@borsbors 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 Aug 4, 2025
@bors

bors commented Aug 4, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit fe644eb with merge e1b9081...

@bors

bors commented Aug 4, 2025

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 4, 2025
@bors
bors merged commit e1b9081 into rust-lang:masterAug 4, 2025
11 checks passed
@rustbotrustbot added this to the 1.91.0 milestone Aug 4, 2025
@rust-timer

rust-timer commented Aug 4, 2025

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#144694Distinguish prepending and replacing self ty in predicates8cc7f3f45c1810b31970ca7262f220671a112846 (link)
#144875Add some pre-codegen MIR tests for debug mode96acb107a2ab9584c60568c7305c9f3f45809138 (link)

previous master: 07b7dc90ee

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions

github-actionsBot commented Aug 4, 2025

Copy link
Copy Markdown
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 07b7dc9 (parent) -> e1b9081 (this PR)

Test differences

Show 8 test diffs

Stage 1

  • [mir-opt] tests/mir-opt/pre-codegen/derived_ord_debug.rs: [missing] -> pass (J1)
  • [mir-opt] tests/mir-opt/pre-codegen/option_bubble_debug.rs: [missing] -> pass (J1)

Stage 2

  • [mir-opt] tests/mir-opt/pre-codegen/derived_ord_debug.rs: [missing] -> pass (J0)
  • [mir-opt] tests/mir-opt/pre-codegen/option_bubble_debug.rs: [missing] -> pass (J0)

Additionally, 4 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 e1b9081e699065badfc1a9419ec9566e5c8615c4 --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-x86_64-apple: 7661.9s -> 10121.0s (32.1%)
  2. x86_64-apple-1: 8993.7s -> 6578.9s (-26.9%)
  3. dist-apple-various: 3710.1s -> 4688.1s (26.4%)
  4. aarch64-apple: 4927.8s -> 6076.9s (23.3%)
  5. pr-check-1: 1461.6s -> 1714.3s (17.3%)
  6. aarch64-gnu-llvm-19-2: 2325.8s -> 2647.1s (13.8%)
  7. x86_64-gnu-llvm-19: 2555.1s -> 2900.7s (13.5%)
  8. x86_64-apple-2: 5203.9s -> 5847.6s (12.4%)
  9. x86_64-rust-for-linux: 2582.1s -> 2896.5s (12.2%)
  10. dist-aarch64-apple: 6834.9s -> 6020.4s (-11.9%)
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-i5q32em branch August 4, 2025 08:52
@rust-timer

rust-timer commented Aug 4, 2025

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e1b9081): 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 (secondary 1.5%)

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

meanrangecount
Regressions ❌
(primary)		--0
Regressions ❌
(secondary)		1.5%[1.5%, 1.5%]1
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		--0
All ❌✅ (primary)--0

Cycles

Results (primary 0.1%, secondary 3.9%)

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

meanrangecount
Regressions ❌
(primary)		2.5%[2.5%, 2.5%]1
Regressions ❌
(secondary)		3.9%[3.7%, 4.1%]2
Improvements ✅
(primary)		-2.3%[-2.3%, -2.3%]1
Improvements ✅
(secondary)		--0
All ❌✅ (primary)0.1%[-2.3%, 2.5%]2

Binary size

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

Bootstrap: 467.146s -> 468.82s (0.36%)
Artifact size: 377.00 MiB -> 376.96 MiB (-0.01%)

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-clippyRelevant to the Clippy team.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Milestone

1.91.0

Development

Successfully merging this pull request may close these issues.

6 participants

@Zalathar@bors@rust-timer@rustbot@compiler-errors@scottmcm