Skip to content

Replace tuple of infer vars for upvar_tys with single infer var - #77873

Merged
bors merged 4 commits into
rust-lang:masterfrom
sexxi-goose:use_tuple_inference_for_closures
Oct 15, 2020
Merged

Replace tuple of infer vars for upvar_tys with single infer var#77873
bors merged 4 commits into
rust-lang:masterfrom
sexxi-goose:use_tuple_inference_for_closures

Conversation

@roxelo

@roxeloroxelo commented Oct 12, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

This commit allows us to decide the number of captures required after
completing capture ananysis, which is required as part of implementing
RFC-2229.

closesrust-lang/project-rfc-2229#4
r? @nikomatsakis

roxeloand others added 3 commits October 11, 2020 03:32
@roxelo@arora-aman@jenniferwills
Replace tuple of infer vars for upvar_tys with single infer var
dc18370
This commit allows us to decide the number of captures required after
completing capture ananysis, which is required as part of implementing
RFC-2229.
Co-authored-by: Aman Arora <me@aman-arora.com>
Co-authored-by: Jenny Wills <wills.jenniferg@gmail.com>
@arora-aman@roxelo
Always return tupled_upvar_tys for Closure/Generator consituent tys
08d1ab0
Depending on if upvar_tys inferred or not, we were returning either an
inference variable which later resolves to a tuple or else the upvar tys
themselves
Co-authored-by: Roxane Fruytier <roxane.fruytier@hotmail.com>
@arora-aman@roxelo
traits diagnostics: Don't print closure/generator upvar_tys tuple
3c46fd6
Co-authored-by: Roxane Fruytier <roxane.fruytier@hotmail.com>
@rust-highfive

rust-highfive commented Oct 12, 2020

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @lcnr (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 12, 2020
@arora-aman

arora-aman commented Oct 12, 2020

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

@roxeloroxelo changed the title Use tuple inference for closures and generatorsReplace tuple of infer vars for upvar_tys with single infer varOct 12, 2020
@roxelo
roxelo marked this pull request as ready for review October 12, 2020 22:19
@nikomatsakisnikomatsakis self-assigned this Oct 12, 2020
nikomatsakis
nikomatsakis reviewed Oct 13, 2020
View reviewed changes

@nikomatsakisnikomatsakis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great -- I left some comments on how we could simplify, some of which I see now were outdated by later commits, but not all of them I think.

Comment threadcompiler/rustc_middle/src/ty/outlives.rs Outdated
Comment threadcompiler/rustc_middle/src/ty/outlives.rs Outdated
Comment threadcompiler/rustc_middle/src/ty/print/pretty.rs
Comment threadcompiler/rustc_trait_selection/src/opaque_types.rs Outdated
Comment threadcompiler/rustc_trait_selection/src/opaque_types.rs Outdated
Comment threadcompiler/rustc_trait_selection/src/traits/select/mod.rs Outdated
Comment threadcompiler/rustc_trait_selection/src/traits/select/mod.rs Outdated
Comment threadcompiler/rustc_traits/src/dropck_outlives.rs
Comment threadcompiler/rustc_traits/src/dropck_outlives.rs
@arora-aman

arora-aman commented Oct 14, 2020

Copy link
Copy Markdown
Contributor

@nikomatsakis updated

@nikomatsakis

nikomatsakis commented Oct 14, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 14, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit a64ad51 has been approved by nikomatsakis

@borsbors 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 Oct 14, 2020
@bors

bors commented Oct 14, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a64ad51 with merge 24ca6e8ea039d1dad6de4c10cb036cc6cd241d81...

@borsbors mentioned this pull request Oct 14, 2020
Merged
@bors

bors commented Oct 14, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 14, 2020
@Dylan-DPC-zz

Dylan-DPC-zz commented Oct 14, 2020

Copy link
Copy Markdown

@bors retry

@borsbors 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 Oct 14, 2020
@bors

bors commented Oct 15, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a64ad51 with merge 93deabc...

@bors

bors commented Oct 15, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: nikomatsakis
Pushing 93deabc to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 15, 2020
@bors
bors merged commit 93deabc into rust-lang:masterOct 15, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 15, 2020
@arora-amanarora-aman mentioned this pull request Oct 15, 2020
Closed
@matthiaskrgrmatthiaskrgr mentioned this pull request Oct 15, 2020
Closed
@arora-aman
arora-aman deleted the use_tuple_inference_for_closures branch October 21, 2020 09:47
@Mark-Simulacrum

Mark-Simulacrum commented Oct 22, 2020

Copy link
Copy Markdown
Member

This appears to be a 3% regression on the wg-grammar benchmark, though wall times look like they're overall an improvement. Since this is appears to be a functional (not perf-related) change I am inclined to not do anything further here.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis approved these changes

Assignees

@nikomatsakisnikomatsakis

@lcnrlcnr

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.49.0

Development

Successfully merging this pull request may close these issues.

Always make the "upvar types" a tuple of the actual upvar types (Parent issue#53488)

9 participants

@roxelo@rust-highfive@arora-aman@nikomatsakis@bors@Dylan-DPC-zz@Mark-Simulacrum@lcnr@rustbot