Skip to content

Rollup of 3 pull requests#156134

Merged
rust-bors[bot] merged 9 commits intorust-lang:mainfrom
jhpratt:rollup-79KaBC4
May 4, 2026
Merged

Rollup of 3 pull requests#156134
rust-bors[bot] merged 9 commits intorust-lang:mainfrom
jhpratt:rollup-79KaBC4

Conversation

@jhpratt
Copy link
Copy Markdown
Member

@jhpratt jhpratt commented May 4, 2026

Successful merges:

r? @ghost

Create a similar rollup

inq and others added 9 commits May 4, 2026 04:00
@inq
Regression test for trait-system-refactor#7
44a7eb0
@GTimothy
refactor using ExprParenthesesNeeded where possible
ed2356a 
found multiple instances where the equivalent of ExprParenthesesNeeded
was done 'manually'.
replaced them with a `ExprParenthesesNeeded::surrounding` call
@nnethercote
Remove unused 'tcx lifetime from trait Print.
67ba480
@nnethercote
Shift lift calls outward.
809fcab 
Several printing functions (e.g. `short_string`) take a liftable
parameter. This commit changes the call sites to do the lifting instead.
This simplifies the type signatures and puts the `lift` calls inside
`tls::with` calls which is where they usually appear, and the minor cost
of having more `lift` call sites.
@nnethercote
Remove silly FmtPrinter<'tcx, 'tcx> instance.
2cf4884 
This doesn't match any of the other uses.
@inq @lcnr
Apply suggestion from @lcnr
d4c413e 
Co-authored-by: lcnr <rust@lcnr.de>
@jhpratt
Rollup merge of rust-lang#156120 - inq:test-alias-relate-7, r=lcnr
19fbc62 
Regression test for trait-system-refactor#7

Adds a regression test for [`AliasRelate` hides info in transitive cases](rust-lang/trait-system-refactor-initiative#7).

The example previously errored under the new solver but compiles cleanly now thanks to eager normalization (post-rust-lang/rust#119106). Verified on both the `old` and `next` revisions.

The issue body has an older TODO suggesting a goal-proving variant test; per lcnr's recent note in `#t-types/trait-system-refactor` ("this isn't an issue as we eagerly normalize"), the underlying mechanism is now resolved across both inference and goal-proving paths, so this single regression test is sufficient. Closing the upstream issue manually after merge.

r? @lcnr
@jhpratt
Rollup merge of rust-lang#156125 - GTimothy:refactor-exprparenthesesn…
06c89cf 
…eeded, r=ShoyuVanilla

refactor using ExprParenthesesNeeded where possible

Found multiple instances where the equivalent of `ExprParenthesesNeeded` was done 'manually'.
Replaced them with an `ExprParenthesesNeeded::surrounding` call.
@jhpratt
Rollup merge of rust-lang#156132 - nnethercote:more-lifting-tweaks, r…
037e2b0 
…=oli-obk

More lifting tweaks

Details in individual commits.

r? @oli-obk
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label May 4, 2026
@rustbot rustbot added 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels May 4, 2026
@jhpratt
Copy link
Copy Markdown
Member Author

jhpratt commented May 4, 2026

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 4, 2026

📌 Commit 037e2b0 has been approved by jhpratt

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 4, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 4, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 4, 2026

☀️ Test successful - CI
Approved by: jhpratt
Duration: 3h 9m 26s
Pushing 1d72d7e to main...

@rust-bors rust-bors Bot merged commit 1d72d7e into rust-lang:main May 4, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone May 4, 2026
@jhpratt jhpratt deleted the rollup-79KaBC4 branch May 4, 2026 12:41
@rust-timer
Copy link
Copy Markdown
Collaborator

rust-timer commented May 4, 2026

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#156120 Regression test for trait-system-refactor#7 f5ec2e81629bceed9a2a8b2ffd36558fdc7ce269 (link)
#156125 refactor using ExprParenthesesNeeded where possible 30c948185620c818e5c78acc864332b5daf04c09 (link)
#156132 More lifting tweaks 6515a24de9effdb54d7765cc50c1b547dabd1321 (link)

previous master: 783062d3c6

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
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 4, 2026

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 783062d (parent) -> 1d72d7e (this PR)

Test differences

Show 26 test diffs

Stage 1

  • [ui] tests/ui/traits/next-solver/alias-relate/transitive-inference.rs#next: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/alias-relate/transitive-inference.rs#old: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/traits/next-solver/alias-relate/transitive-inference.rs#next: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/alias-relate/transitive-inference.rs#old: [missing] -> pass (J1)

Additionally, 22 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 1d72d7e8136faaebad3a85eeed432e6ea1b2ffab --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-gnu: 1h 48m -> 2h 24m (+33.9%)
  2. dist-aarch64-apple: 1h 51m -> 2h 27m (+32.9%)
  3. dist-sparcv9-solaris: 1h 14m -> 1h 35m (+27.2%)
  4. x86_64-rust-for-linux: 45m 20s -> 55m 31s (+22.4%)
  5. dist-various-2: 44m 12s -> 35m 25s (-19.9%)
  6. dist-armv7-linux: 1h 32m -> 1h 14m (-19.6%)
  7. test-various: 1h 51m -> 2h 13m (+19.1%)
  8. x86_64-gnu-miri: 1h 20m -> 1h 33m (+16.6%)
  9. aarch64-gnu-debug: 1h 6m -> 1h 16m (+15.5%)
  10. x86_64-gnu-llvm-21: 1h 9m -> 1h 19m (+14.8%)
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
Copy Markdown
Collaborator

rust-timer commented May 4, 2026

Finished benchmarking commit (1d72d7e): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (primary 1.5%, secondary -2.8%)

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

mean range count
Regressions ❌
(primary)		 1.5% [1.5%, 1.5%] 1
Regressions ❌
(secondary)		 2.9% [2.9%, 2.9%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -4.2% [-7.5%, -0.7%] 4
All ❌✅ (primary) 1.5% [1.5%, 1.5%] 1

Cycles

Results (secondary 1.9%)

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)		 8.2% [0.5%, 31.0%] 8
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.1% [-5.1%, -0.7%] 10
All ❌✅ (primary) - - 0

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 495.891s -> 494.198s (-0.34%)
Artifact size: 394.42 MiB -> 394.42 MiB (-0.00%)

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

Reviewers

No reviews

Assignees

No one assigned

Labels

merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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)

Projects

None yet

Milestone

1.97.0

Development

Successfully merging this pull request may close these issues.

6 participants

@jhpratt @rust-timer @rustbot @inq @GTimothy @nnethercote