Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 15 commits June 28, 2023 17:51
…-sugg-ice, r=cjgillot

Tweak spans for self arg, fix borrow suggestion for signature mismatch

1. Adjust a suggestion message that was annoying me
2. Fix rust-lang#112503 by recording the right spans for the `self` part of the `&self` 0th argument
3. Remove the suggestion for adjusting a trait signature on type mismatch, bc that's gonna probably break all the other impls of the trait even if it fixes its one usage 😅
…lcnr

Get rid of subst-relate incompleteness in new solver

We shouldn't need subst-relate if we have bidirectional-normalizes-to in the new solver.

The only potential issue may happen if we have an unconstrained projection like `<Wrapper<?0> as Trait>::Assoc == <Wrapper<T> as Trait>::Assoc` where they both normalize to something that doesn't mention any substs, which would possibly prefer `?0 = T` if we fall back to subst-relate. But I'd prefer if we remove incompleteness until we can determine some case where we need them, and the bidirectional-normalizes-to seems better to have in general.

I can update rust-lang/trait-system-refactor-initiative#26 and rust-lang/trait-system-refactor-initiative#25 once this lands.

r? `@lcnr`
…trap, r=clubby789

Fix rustc-args passing issue in bootstrap

Fixes rust-lang#113178, r? `@jyn514`
Remove Scope::Elision from bound-vars resolution.

This scope is a remnant of HIR-based lifetime resolution.

It's only role was to ensure that object lifetime resolution falled back to `'static`. This can be done using `ObjectLifetimeDefault` scope.
…, r=dtolnay

Add regression test for issue rust-lang#113941 - naive layout isn't refined

This PR adds a regression test for issue rust-lang#113941 - `the naive layout isn't refined by the actual layout` based on the minimized repro rust-lang#113941 (comment).
…lor-22, r=notriddle

Migrate GUI colors test to original CSS color format

Follow-up of rust-lang#111459.

r? `@notriddle`
@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-rustdoc Relevant to the rustdoc 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 22, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Jul 22, 2023

📌 Commit 5215343 has been approved by matthiaskrgr

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 22, 2023
@bors
Copy link
Collaborator

bors commented Jul 22, 2023

⌛ Testing commit 5215343 with merge a6fbd1c...

@bors
Copy link
Collaborator

bors commented Jul 22, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing a6fbd1c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 22, 2023
@bors bors merged commit a6fbd1c into rust-lang:master Jul 22, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 22, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#112508 Tweak spans for self arg, fix borrow suggestion for signatu… b46cc8cd4691a85b82bdbbeaad4a2fa552a9955a (link)
#113901 Get rid of subst-relate incompleteness in new solver 550c6036605a24107822ebc0428485f4cecc34f2 (link)
#113948 Fix rustc-args passing issue in bootstrap b7149f77abc4092f7008f1d2eb64abd142d679d9 (link)
#113950 Remove Scope::Elision from bound-vars resolution. b0033b051461163a7ca40f7b8d6984742e23b0b2 (link)
#113957 Add regression test for issue #113941 - naive layout isn't … 9fda4ebb836bec9d96aa879f46041896568a620f (link)
#113959 Migrate GUI colors test to original CSS color format 1d9b091d6d57331b17b3f3ec05aab2014b5e37bc (link)

previous master: c39995485f

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 (a6fbd1c): 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

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)
2.7% [2.7%, 2.7%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 651.103s -> 651.047s (-0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-7vdfcba branch March 16, 2024 18:18
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-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-rustdoc Relevant to the rustdoc 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.

9 participants