Rollup of 8 pull requests#105738
Closed
matthiaskrgr wants to merge 19 commits intorust-lang:masterfrom
Closed
Conversation
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
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
…-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``
rustbot
added
A-translation
Member
Author
|
@bors r+ rollup=never p=8 |
Collaborator
bors
added
S-waiting-on-bors
Collaborator
|
⌛ Testing commit e1beb87 with merge 6f5f52ec8615dbdad2530e1208deda6b58c148bc... |
Collaborator
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
Member
Author
|
@bors retry network error |
bors
added
S-waiting-on-bors
Member
Author
|
nevermind, one of the commits is already testing.. |
Collaborator
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Successful merges:
-Z print-type-sizesfor generators with discriminant field ordered first #105623 (Fix-Z print-type-sizesfor generators with discriminant field ordered first)dyn Trait + Autoare suggestable #105627 (Auto traits indyn Trait + Autoare suggestable)report_projection_errormoreTermagnostic #105633 (Makereport_projection_errormoreTermagnostic)Failed merges:
E0271errors #105674 (Point at method chains onE0271errors)Clone#105679 (Suggest constraining type parameter withClone)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup