Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace ClosureSubsts with SubstsRef #64817

Merged
merged 4 commits into from
Oct 4, 2019
Merged

Replace ClosureSubsts with SubstsRef #64817

merged 4 commits into from
Oct 4, 2019

Conversation

csmoe
Copy link
Member

@csmoe csmoe commented Sep 26, 2019

Addresses #42340 part 3
#59312 might benefit from this clean up.
r? @nikomatsakis

@csmoe csmoe changed the title [WIP] Refactor Closure/Generator to be a (TypeCore, Substs) pair Replace ClosureSubsts with SubstsRef Sep 27, 2019
@csmoe csmoe added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 27, 2019
@csmoe csmoe force-pushed the closure branch 2 times, most recently from c42ebea to 8ad7407 Compare September 28, 2019 02:09
@bors
Copy link
Contributor

bors commented Sep 29, 2019

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

src/librustc/ty/subst.rs Outdated Show resolved Hide resolved
@csmoe csmoe force-pushed the closure branch 17 times, most recently from 6183c5a to 0dd0395 Compare October 2, 2019 14:19
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

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

Thanks @csmoe! A few more thoughts.

src/librustc/infer/opaque_types/mod.rs Outdated Show resolved Hide resolved
src/librustc/mir/visit.rs Outdated Show resolved Hide resolved
@csmoe csmoe force-pushed the closure branch 9 times, most recently from 3631fa6 to bb3df5a Compare October 3, 2019 04:36
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

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

OK! This is looking really good. One last request, @csmoe, and thanks <3

src/librustc/ty/subst.rs Outdated Show resolved Hide resolved
@csmoe csmoe force-pushed the closure branch 4 times, most recently from 624a3a1 to 16e4c49 Compare October 3, 2019 11:17
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Oct 3, 2019

📌 Commit 9b91bef has been approved by nikomatsakis

@bors 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 Oct 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 4, 2019
Replace ClosureSubsts with SubstsRef

Addresses rust-lang#42340 part 3
rust-lang#59312 might benefit from this clean up.
r? @nikomatsakis
bors added a commit that referenced this pull request Oct 4, 2019
Rollup of 5 pull requests

Successful merges:

 - #64749 (Fix most remaining Polonius test differences)
 - #64817 (Replace ClosureSubsts with SubstsRef)
 - #64874 (Simplify ExprUseVisitor)
 - #65026 (metadata: Some crate loading cleanup)
 - #65073 (Remove `borrowck_graphviz_postflow` from test)

Failed merges:

r? @ghost
@bors bors merged commit 9b91bef into rust-lang:master Oct 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants