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 8 pull requests #113429

Merged
merged 17 commits into from
Jul 7, 2023
Merged

Conversation

compiler-errors
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkin and others added 17 commits May 24, 2023 16:07
…st-lang#113283)

Verify that `PartialEq` implementations do not break type inference
when comparing types across different allocators. This catches a
regression in current nightly introduced in 001b081 (alloc: Allow
comparing `Box`s over different allocators")

`Box` is the only type that currently impelements this, but tests are
included for `Rc` and `Arc` to prevent future regresssions.
This reverts commit 001b081.

This change was done as the above commit introduces a regression in type
inference. Regression test located at
`tests/ui/type-inference/issue-113283-alllocator-trait-eq.rs`
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
…li-obk

Simplify duplicate checks for mir validator

This removes unnecessary allocations & is less code.
Fix incorrect documented default bufsize in bufreader/writer
…e, r=lcnr

Don't call `type_of` on TAIT in defining scope in new solver

It's *never* productive to call `consider_auto_trait_candidate` on a TAIT in the defining scope, since it will always lead to a query cycle since we call `type_of` on the TAIT. So let's just don't.

I've reserved this behavior just to `SolverMode::Normal` just to avoid any future problems, since this is *technically* incomplete since we're discarding a candidate that could *theoretically* apply. But given such candidate assembly *always* leads to a query cycle, I think it's relatively low risk, and I could be convinced otherwise and make this apply to both solver mode. I assume it's far less likely to be encountered in coherence, though.

This is much more likely to encounter in the new solver, though it can also be encountered in the old solver too, so I'm happy to discuss whether this new behavior we even want in the first place...

I encountered this in a couple of failing UI tests:
* `tests/ui/type-alias-impl-trait/issue-62000-associate-impl-trait-lifetimes.rs`
* `tests/ui/type-alias-impl-trait/issue-93411.rs`

r? `@lcnr`
…-errors

Add a regression test for rust-lang#109054

Closes rust-lang#109054
r? ``@compiler-errors``
…, r=m-ou-se

Revert "alloc: Allow comparing Boxs over different allocators", add regression test

Temporary fix for rust-lang#113283

Adds a test to fix the regression introduced in 001b081 and revert that commit. The test fails without the revert.
…obj, r=lcnr

Prefer object candidates in new selection

`dyn Any` shouldn't be using [this implementation](https://doc.rust-lang.org/std/any/trait.Any.html#impl-Any-for-T) during codegen.

Prefer object candidates over other candidates, except for other object candidates.
…er-errors

Avoid calling item_name for RPITIT

Fixes rust-lang#113405

r? `@compiler-errors`
…er-errors

Do not assert >1 RPITITs on collect_return_position_impl_trait_in_trait_tys

Fixes rust-lang#113403

Assert on collect_return_position_impl_trait_in_trait_tys is not correct when we call it from type_of(GAT). The included test is an example of a situation that collector collects 0 types.

r? `@compiler-errors`
@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. T-libs Relevant to the library 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 7, 2023
@compiler-errors
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Jul 7, 2023

📌 Commit 45cb1ba 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 7, 2023
@bors
Copy link
Contributor

bors commented Jul 7, 2023

⌛ Testing commit 45cb1ba with merge 7cc3da0...

@bors
Copy link
Contributor

bors commented Jul 7, 2023

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

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#111917 Simplify duplicate checks for mir validator 3113d0c95f6696792036f095b02d19555fe479b5 (link)
#112008 Fix incorrect documented default bufsize in bufreader/writer 3b2f151607c4db58222dd95ecf8a1088d638dc64 (link)
#112825 Don't call type_of on TAIT in defining scope in new solver ad876e5304d416c718a8c4ee81e354d2d8e4ca74 (link)
#113164 Add a regression test for #109054 97ebefad244f70eca97de99594074f95563621d7 (link)
#113318 Revert "alloc: Allow comparing Boxs over different allocato… 4643d55cf60e84695bbed2309d071b0923581860 (link)
#113397 Prefer object candidates in new selection f4721643bf9c68fc1cda2e1457432a10145e40b4 (link)
#113419 Avoid calling item_name for RPITIT 962035db9952318105102c965ac2c7bdb760d290 (link)
#113421 Do not assert >1 RPITITs on collect_return_position_impl_tr… 06a9aeece60c087f0418ed12919ba76d0b649c3b (link)

previous master: bb548f9645

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 (7cc3da0): 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.5%, 2.8%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.8% [-2.8%, -2.8%] 1
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: 656.634s -> 658.984s (0.36%)

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. T-libs Relevant to the library 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