Rollup of 10 pull requests #105731

matthiaskrgr · 2022-12-15T05:27:55Z

Successful merges:

Use impl's def id when calculating type to specify in UFCS #104334 (Use impl's def id when calculating type to specify in UFCS)
Ensure async trait impls are async (or otherwise return an opaque type) #104592 (Ensure async trait impls are async (or otherwise return an opaque type))
Highlight conflicting param-env candidates, again #105285 (Highlight conflicting param-env candidates, again)
Fix -Z print-type-sizes for generators with discriminant field ordered first #105623 (Fix -Z print-type-sizes for generators with discriminant field ordered first)
Auto traits in dyn Trait + Auto are suggestable #105627 (Auto traits in dyn Trait + Auto are suggestable)
Make report_projection_error more Term agnostic #105633 (Make report_projection_error more Term agnostic)
Point at method chains on E0271 errors #105674 (Point at method chains on E0271 errors)
Suggest constraining type parameter with Clone #105679 (Suggest constraining type parameter with Clone)
Add regression test for #104678 #105692 (Add regression test for async_fn_in_trait: lifetime of implemented async trait fn wrongly evaluates to static #104678)
more clippy::complexity fixes #105722 (more clippy::complexity fixes)

Failed merges:

Do not mention long types in E0599 label #105715 (Do not mention long types in E0599 label)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Fix rust-lang#34896.

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

When `with_forced_trimmed_paths` is used, only print filename and start of the closure's span, to reduce their verbosity.

Do not say "Type changed to X here" when the only difference is caused by lifetimes.

As a workaround for the full `#[refine]` semantics not being implemented yet, forbit returning a concrete future type like `Box<dyn Future>` or a manually implemented Future. `-> impl Future` is still permitted; while that can also cause accidental refinement, that's behind a different feature gate (`return_position_impl_trait_in_trait`) and that problem exists regardless of whether the trait method is async, so will have to be solved more generally. Fixes rust-lang#102745

…f-id, r=estebank Use impl's def id when calculating type to specify in UFCS Fixes rust-lang#104327 Fixes rust-lang#104328 Also addresses rust-lang#102670 (comment)

…ler-errors Ensure async trait impls are async (or otherwise return an opaque type) As a workaround for the full `#[refine]` semantics not being implemented yet, forbit returning a concrete future type like `Box<dyn Future>` or a manually implemented Future. `-> impl Future` is still permitted; while that can also cause accidental refinement, that's behind a different feature gate (`return_position_impl_trait_in_trait`) and that problem exists regardless of whether the trait method is async, so will have to be solved more generally. Fixes rust-lang#102745

…env-2, r=estebank Highlight conflicting param-env candidates, again Un-reverts rust-lang#98794 (i.e. reverts rust-lang#99290). The previous time I attempted to land this PR, it was because of an incremental issue (rust-lang#99233). The repro instructions in the issue is no longer manifest the ICE -- I think it's because this ambiguity code was refactored (I think by ```@lcnr)``` to no longer store the ambiguities in the fulfillment error, but instead recompute them on the fly. The main motivation for trying to re-land this is that it fixes rust-lang#105131 by highlighting the root-cause of the issue, which is conflicting param-env candidates: ``` error[E0283]: type annotations needed: cannot satisfy `Self: Gen<'source>` | note: multiple `impl`s or `where` clauses satisfying `Self: Gen<'source>` found --> $DIR/conflicting-bounds.rs:3:1 | LL | pub trait Gen<'source> { | ^^^^^^^^^^^^^^^^^^^^^^ ... LL | Self: for<'s> Gen<'s, Output = T>; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error For more information about this error, try `rustc --explain E0283`. ``` Fixes rust-lang#105131. Fixes (again) rust-lang#98786

…e-fix, r=Nilstrieb Fix `-Z print-type-sizes` for generators with discriminant field ordered first Fixes rust-lang#105589 Fixes rust-lang#105591

…le, r=davidtwco Auto traits in `dyn Trait + Auto` are suggestable Not sure why I had made the `IsSuggestableVisitor` have that rule to not consider `dyn Trait + Auto` to be suggestable. It's possible that this was done because of the fact that we don't print the right parentheses for `&(dyn Trait + Auto)`, but that's a problem with printing these types in general that we probably have tracked somewhere else...

…li-obk Make `report_projection_error` more `Term` agnostic Fixes rust-lang#105632

Point at method chains on `E0271` errors Follow up to rust-lang#105332. Fix rust-lang#33941. CC rust-lang#9082. r? ```@oli-obk```

…-errors Suggest constraining type parameter with `Clone` Fix rust-lang#34896.

…-errors Add regression test for rust-lang#104678 Closes rust-lang#104678 r? ```@compiler-errors``` Signed-off-by: Yuki Okushi <jtitor@2k36.org>

…rors more clippy::complexity fixes r? `@compiler-errors`

matthiaskrgr · 2022-12-15T05:28:24Z

@bors r+ rollup=never p=10

bors · 2022-12-15T05:28:26Z

📌 Commit 6028c29 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-12-15T07:23:32Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-uque6to (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-uque6to --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
CONFLICT (content): Merge conflict in compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
Auto-merging compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
Auto-merging compiler/rustc_middle/src/ty/print/pretty.rs
Auto-merging compiler/rustc_middle/src/ty/diagnostics.rs
Auto-merging compiler/rustc_hir_typeck/src/method/suggest.rs
Auto-merging compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs
CONFLICT (content): Merge conflict in compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs
Auto-merging compiler/rustc_hir_analysis/src/check/compare_method.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2022-12-15T08:24:48Z

☔ The latest upstream changes (presumably #105657) made this pull request unmergeable. Please resolve the merge conflicts.

estebank and others added 28 commits December 13, 2022 18:55

Suggest constraining type parameter with Clone

bc92321

Fix rust-lang#34896.

Suggest #[derive(Clone)]

0fb8d84

Add regression test for rust-lang#104678

687b4d9

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Consider discriminant fields that are ordered before variant fields

5f5ae17

Make print_type_sizes test not use feature(start)

bdc3c4b

Point at method chains on E0271 errors

10368c6

Use with_forced_trimmed_paths more

36b60e7

Shorten trimmed display of closures

50e269f

When `with_forced_trimmed_paths` is used, only print filename and start of the closure's span, to reduce their verbosity.

Trim paths in E0599

e9ef36a

Consider lifetimes when comparing assoc types in method chain

7f8fdf4

Do not say "Type changed to X here" when the only difference is caused by lifetimes.

Use impl's def id when calculating type to specify UFCS

ae60015

drive-by: Fix path spans

1225a65

Make report_projection_error more term agnostic

7bf36de

Auto traits in dyn are suggestable

cfa6a93

Highlight conflicting param-env candidates, again

34d194d

Add test

d10f6b4

more clippy::complexity fixes

de59844

Rollup merge of rust-lang#104334 - compiler-errors:ufcs-sugg-wrong-de…

5261162

…f-id, r=estebank Use impl's def id when calculating type to specify in UFCS Fixes rust-lang#104327 Fixes rust-lang#104328 Also addresses rust-lang#102670 (comment)

Rollup merge of rust-lang#105623 - compiler-errors:generator-type-siz…

601eedd

…e-fix, r=Nilstrieb Fix `-Z print-type-sizes` for generators with discriminant field ordered first Fixes rust-lang#105589 Fixes rust-lang#105591

Rollup merge of rust-lang#105633 - compiler-errors:term-agnostic, r=o…

b9e0d60

…li-obk Make `report_projection_error` more `Term` agnostic Fixes rust-lang#105632

Rollup merge of rust-lang#105674 - estebank:iterator-chains, r=oli-obk

ad8be3e

Point at method chains on `E0271` errors Follow up to rust-lang#105332. Fix rust-lang#33941. CC rust-lang#9082. r? ```@oli-obk```

Rollup merge of rust-lang#105679 - estebank:suggest-clone, r=compiler…

1603335

…-errors Suggest constraining type parameter with `Clone` Fix rust-lang#34896.

Rollup merge of rust-lang#105692 - JohnTitor:issue-104678, r=compiler…

111ef5f

…-errors Add regression test for rust-lang#104678 Closes rust-lang#104678 r? ```@compiler-errors``` Signed-off-by: Yuki Okushi <jtitor@2k36.org>

Rollup merge of rust-lang#105722 - matthiaskrgr:compl2, r=compiler-er…

6028c29

…rors more clippy::complexity fixes r? `@compiler-errors`

rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 15, 2022

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Dec 15, 2022

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 Dec 15, 2022

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 15, 2022

matthiaskrgr closed this Dec 15, 2022

matthiaskrgr deleted the rollup-uque6to branch December 22, 2022 10:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #105731

Rollup of 10 pull requests #105731

matthiaskrgr commented Dec 15, 2022

matthiaskrgr commented Dec 15, 2022

bors commented Dec 15, 2022

bors commented Dec 15, 2022

bors commented Dec 15, 2022

Rollup of 10 pull requests #105731

Rollup of 10 pull requests #105731

Conversation

matthiaskrgr commented Dec 15, 2022

matthiaskrgr commented Dec 15, 2022

bors commented Dec 15, 2022

bors commented Dec 15, 2022

bors commented Dec 15, 2022