Refactor ty::ClosureKind related stuff#104732
Merged
bors merged 6 commits intorust-lang:masterfrom Nov 28, 2022
Merged
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs
Outdated
Show resolved
Hide resolved
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
Outdated
Show resolved
Hide resolved
Contributor
|
r=me after nits @bors delegate+ |
Collaborator
|
✌️ @WaffleLapkin can now approve this pull request |
Member
Author
|
@bors r=compiler-errors |
Collaborator
bors
added
S-waiting-on-bors
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Nov 23, 2022
…piler-errors Refactor `ty::ClosureKind` related stuff I've tried to fix all duplication and weirdness, but if I missed something do tell :p r? `@compiler-errors`
This was referenced Nov 23, 2022
Collaborator
|
☔ The latest upstream changes (presumably #104743) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 23, 2022
…earth Rollup of 6 pull requests Successful merges: - rust-lang#103488 (Allow opaque types in trait impl headers and rely on coherence to reject unsound cases) - rust-lang#104359 (Refactor must_use lint into two parts) - rust-lang#104612 (Lower return type outside async block creation) - rust-lang#104621 (Fix --extern library finding errors) - rust-lang#104647 (enable fuzzy_provenance_casts lint in liballoc and libstd) - rust-lang#104750 (Bump `fd-lock` in `bootstrap` again) Failed merges: - rust-lang#104732 (Refactor `ty::ClosureKind` related stuff) r? `@ghost` `@rustbot` modify labels: rollup
rust-cloud-vms
bot
force-pushed
the
from_def_idn't
branch
from
48fee7a to
2b24be0
Compare
Member
Author
|
Conflicting with my other PR, you love to see it |
Collaborator
|
📌 Commit 2b24be06799e1b7ff93ef289da8d3e3411f273d4 has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
Collaborator
|
☔ The latest upstream changes (presumably #104846) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
…in favour of `TyCtxt::fn_trait_kind_from_def_id`
This is valid per the comment of the `ClosureKind` defition
rust-cloud-vms
bot
force-pushed
the
from_def_idn't
branch
from
2b24be0 to
5ba0056
Compare
Member
Author
|
Let's try again @bors r=compiler-errors |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 28, 2022
Rollup of 6 pull requests Successful merges: - rust-lang#104360 (Stabilize native library modifier `verbatim`) - rust-lang#104732 (Refactor `ty::ClosureKind` related stuff) - rust-lang#104795 (Change multiline span ASCII art visual order) - rust-lang#104890 (small method code cleanup) - rust-lang#104907 (Remove `SelectionContext::infcx()` in favor of field access) - rust-lang#104927 (Simplify some binder shifting logic) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
4 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.
I've tried to fix all duplication and weirdness, but if I missed something do tell :p
r? @compiler-errors