Skip to content
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

Rollup of 4 pull requests #127430

Merged
merged 11 commits into from
Jul 6, 2024
Merged

Conversation

compiler-errors
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

trevyn and others added 11 commits July 6, 2024 09:13
We could use rustc_middle::ty::outlives I guess?
…mponents, r=lcnr

Uplift outlives components to `rustc_type_ir`

We need this to uplift `push_outlives_components`, since the elaborator uses `push_outlives_components` to elaborate type outlives obligations and I want to uplift elaboration.

This ends up reworking and inlining a fair portion of the `GenericArg::walk_shallow` function, whose only callsite was this one. I believe I got the logic correct, but may be worthwhile to look at it closely just in case. Unfortunately github was too dumb to understand that this is a rename + change -- I could also rework the git history to split the "copy the file over" part from the actual logical changes if that makes this easier to review.

r? lcnr
…mitting-relation, r=lcnr

uplift `PredicateEmittingRelation`

Small follow-up to rust-lang#127333

r? lcnr
…ff, r=oli-obk

Show fnsig's unit output  explicitly when there is output diff in diagnostics

Fixes rust-lang#127263
@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) rollup A PR which is a rollup labels Jul 6, 2024
@compiler-errors
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Jul 6, 2024

📌 Commit 413345c has been approved by compiler-errors

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 6, 2024
@bors
Copy link
Contributor

bors commented Jul 6, 2024

⌛ Testing commit 413345c with merge ed7e35f...

@bors
Copy link
Contributor

bors commented Jul 6, 2024

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing ed7e35f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 6, 2024
@bors bors merged commit ed7e35f into rust-lang:master Jul 6, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 6, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#127386 Uplift outlives components to rustc_type_ir 5e217c478c7edf8904f6921af10e4ab2e80c96ff (link)
#127405 uplift PredicateEmittingRelation d869a6b2d1aa3e2db1e4f2d27816c5aac11149bd (link)
#127410 Correct description of E0502 9db5f43554688e96729170d3bc9a2ec59c0e196b (link)
#127417 Show fnsig's unit output explicitly when there is output d… 90128e6911b6ce367ebd63fb958b5366a234e918 (link)

previous master: 8a8ad3433e

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ed7e35f): 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 -2.0%)

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)
-2.0% [-2.4%, -0.8%] 5
All ❌✅ (primary) - - 0

Cycles

Results (secondary -2.4%)

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.9% [0.4%, 2.1%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.2% [-4.3%, -1.9%] 18
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 701.007s -> 700.852s (-0.02%)
Artifact size: 328.30 MiB -> 328.40 MiB (0.03%)

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-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
Development

Successfully merging this pull request may close these issues.

6 participants