rustc_typeck: construct {Closure,Generator}Substs more directly. #74314
Conversation
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
rust-highfive
added
the
S-waiting-on-review
|
@bors try @rust-timer queue |
|
Awaiting bors try build completion |
|
⌛ Trying commit 5533705 with merge 994616d7663772c32c9ad592d445f68a21fcc155... |
|
☀️ Try build successful - checks-actions, checks-azure |
|
Queued 994616d7663772c32c9ad592d445f68a21fcc155 with parent 9d09331, future comparison URL. |
|
Finished benchmarking try commit (994616d7663772c32c9ad592d445f68a21fcc155): comparison url. |
|
Yeah, it's neutral, no big surprise there. |
nikomatsakis
approved these changes
Jul 17, 2020
There was a problem hiding this comment.
This seems like a more readable version. r=me if you fix your own FIXMEs to rename things, but did you want to hold off to avoid conflicting with @davidtwco's polymorphization PR?
|
@nikomatsakis Yeah, let's land polymorphization first, it's slightly cleaner than this PR anyway. |
Muirrum
added
S-waiting-on-author
Dylan-DPC-zz
added
S-blocked
|
marking it blocked based on author's comment |
|
@Dylan-DPC #69749 had already landed by the time the label was added. |
eddyb
added
S-waiting-on-author
eddyb
force-pushed
the
closure-substs-direct
branch
from
5533705 to
3ad05c2
Compare
|
ah sweet race condition :D |
eddyb
force-pushed
the
closure-substs-direct
branch
from
3ad05c2 to
f5a0896
Compare
eddyb
force-pushed
the
closure-substs-direct
branch
from
f5a0896 to
5d44d54
Compare
|
@bors r=nikomatsakis |
|
📌 Commit 5d44d54 has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Aug 16, 2020
…matsakis
rustc_typeck: construct {Closure,Generator}Substs more directly.
We've previously not had a way to create `{Closure,Generator}Substs` other than instantiating all generics as inference variables and unifying the inference types (extracted using the regular `{Closure,Generator}Substs` accessors), with the actual types.
With this PR, those hacks, and assumptions about the order of closure/generator-specific components, are replaced with a simple API where the base `Substs` are combined with the additional information into a `{Closure,Generator}Substs`.
This might also be faster than relying inference, although probably not by much.
r? @nikomatsakis cc rust-lang#53488 @blitzerr
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 16, 2020
Rollup of 10 pull requests Successful merges: - rust-lang#74204 (Don't visit foreign function bodies when lowering ast to hir) - rust-lang#74314 (rustc_typeck: construct {Closure,Generator}Substs more directly.) - rust-lang#74346 (Use LocalDefId instead of HirId for reachable_set elements.) - rust-lang#74399 (Move DelaySpanBugEmitted to ty::context) - rust-lang#75177 (Add regression test for issue-66768) - rust-lang#75223 (Add #[track_caller] to `Session::delay_span_bug`) - rust-lang#75423 (Move to intra-doc links for /library/core/src/hint.rs) - rust-lang#75485 (pin docs: add some forward references) - rust-lang#75569 (Bump minor version of emsdk to 1.38.47) - rust-lang#75596 (Switch to intra-doc links in /sys/windows/ext/{ffi,fs,process}.rs) Failed merges: r? @ghost
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
We've previously not had a way to create
{Closure,Generator}Substsother than instantiating all generics as inference variables and unifying the inference types (extracted using the regular{Closure,Generator}Substsaccessors), with the actual types.With this PR, those hacks, and assumptions about the order of closure/generator-specific components, are replaced with a simple API where the base
Substsare combined with the additional information into a{Closure,Generator}Substs.This might also be faster than relying inference, although probably not by much.
r? @nikomatsakis cc #53488 @blitzerr