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.

Sign up for GitHub

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

Jump to bottom

Make the type_of return a generic type for generators #68884

Merged
merged 2 commits into from
Mar 24, 2020
Merged

Make the type_of return a generic type for generators #68884

merged 2 commits into from
Mar 24, 2020

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Feb 6, 2020

Fixes #67651.

r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 6, 2020
nikomatsakis
nikomatsakis approved these changes Feb 6, 2020
View reviewed changes
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.

Awesome :)

@nikomatsakis
Copy link
Contributor

@bors r+

Thanks @Zoxc

@bors
Copy link
Contributor

bors commented Feb 6, 2020

📌 Commit 98c51fd 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 Feb 6, 2020
@nikomatsakis
Copy link
Contributor

Could you check, @Zoxc, if this fixes #66312 too?

@Zoxc
Copy link
Contributor Author

Zoxc commented Feb 7, 2020

@nikomatsakis It fixes the async case, but not the other.

@nikomatsakis
Copy link
Contributor

OK, I missed the second case, I suspect that should be broken into its own issue.

@nikomatsakis nikomatsakis mentioned this pull request Feb 7, 2020
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 7, 2020
@Dylan-DPC
Rollup merge of rust-lang#68884 - Zoxc:gen-type, r=nikomatsakis
b1aae7f 
Make the `type_of` return a generic type for generators

Fixes rust-lang#67651.

r? @nikomatsakis
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Feb 7, 2020
Closed
@Dylan-DPC-zz
Copy link

Failed in rollup

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 7, 2020
@Zoxc
Copy link
Contributor Author

Zoxc commented Feb 8, 2020

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Feb 8, 2020

📌 Commit 1ae614f 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 8, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 8, 2020
@Dylan-DPC
Rollup merge of rust-lang#68884 - Zoxc:gen-type, r=nikomatsakis
923f824 
Make the `type_of` return a generic type for generators

Fixes rust-lang#67651.

r? @nikomatsakis
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Feb 8, 2020
Closed
@Dylan-DPC-zz
Copy link

Failed in rollup

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 8, 2020
@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 21, 2020
@bors
Copy link
Contributor

bors commented Mar 23, 2020

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

@nikomatsakis
Copy link
Contributor

Specifically I think that this PR requires a x.py --bless --compare-mode=nll run

@nikomatsakis
Copy link
Contributor

(relevant log output)

@Zoxc
Copy link
Contributor Author

Zoxc commented Mar 24, 2020

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 24, 2020

📌 Commit 47a84f2 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 24, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 24, 2020
@Centril
Rollup merge of rust-lang#68884 - Zoxc:gen-type, r=nikomatsakis
3ef1dd3 
Make the `type_of` return a generic type for generators

Fixes rust-lang#67651.

r? @nikomatsakis
@Centril Centril mentioned this pull request Mar 24, 2020
Closed
@bors
Copy link
Contributor

bors commented Mar 24, 2020

⌛ Testing commit 47a84f2 with merge a81c062c169ef64f4ff9cd719dc23d78e21c7dd9...

@Centril Centril mentioned this pull request Mar 24, 2020
Merged
@Centril
Copy link
Contributor

Centril commented Mar 24, 2020

@bors retry

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 24, 2020
@bors
Auto merge of rust-lang#70351 - Centril:rollup-tveoq3w, r=Centril
9d0ae58 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#68884 (Make the `type_of` return a generic type for generators)
 - rust-lang#69788 (Fix sequence of Type and Trait in optin-builtin-traits in Unstable Book)
 - rust-lang#70074 (Expand: nix all fatal errors)
 - rust-lang#70077 (Store idents for `DefPathData` into crate metadata)
 - rust-lang#70213 (traits/fulfill: allow `stalled_on` to track `ty::Const::Infer(_)` (unused yet).)
 - rust-lang#70259 (Use Reveal::All in MIR optimizations)
 - rust-lang#70284 (correctly handle const params in type_of)
 - rust-lang#70289 (Refactor `codegen`)

Failed merges:

r? @ghost
eddyb
eddyb reviewed Mar 24, 2020
View reviewed changes
src/librustc_typeck/collect/type_of.rs
Comment on lines -191 to -193
if gen.is_some() {
return tcx.typeck_tables_of(def_id).node_type(hir_id);
}
Copy link
Member

Choose a reason for hiding this comment

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

That's funny, I almost did the opposite last week, trying to make #69968 work.
(It was a bad idea and the solution was to fix the actual code that couldn't handle unsubstitued closure types)

@bors
Copy link
Contributor

bors commented Mar 24, 2020

⌛ Testing commit 47a84f2 with merge 9d0ae58...

@bors bors merged commit a130954 into rust-lang:master Mar 24, 2020
@Zoxc Zoxc deleted the gen-type branch March 24, 2020 18:59
@tmandry tmandry mentioned this pull request Mar 24, 2020
Merged
Centril pushed a commit to Centril/rust that referenced this pull request Mar 25, 2020
@tmandry
Add test for rust-lang#66312
1a21c28 
Closes rust-lang#66312. This issue was fixed by rust-lang#68884.
Centril added a commit to Centril/rust that referenced this pull request Mar 25, 2020
@Centril
Rollup merge of rust-lang#70376 - tmandry:issue-66312, r=Centril
54b343d 
Add test for rust-lang#66312

Closes rust-lang#66312. This issue was fixed by rust-lang#68884.

r? @Zoxc
Centril added a commit to Centril/rust that referenced this pull request Mar 25, 2020
@Centril
Rollup merge of rust-lang#70376 - tmandry:issue-66312, r=Centril
9ddd70c 
Add test for rust-lang#66312

Closes rust-lang#66312. This issue was fixed by rust-lang#68884.

r? @Zoxc
Centril added a commit to Centril/rust that referenced this pull request Mar 25, 2020
@Centril
Rollup merge of rust-lang#70376 - tmandry:issue-66312, r=Centril
83fc855 
Add test for rust-lang#66312

Closes rust-lang#66312. This issue was fixed by rust-lang#68884.

r? @Zoxc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddyb eddyb eddyb left review comments

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Confusing/incorrect error message with incoherent implementations and async blocks
9 participants
@Zoxc @nikomatsakis @bors @Dylan-DPC-zz @rust-highfive @estebank @Centril @eddyb @JohnCSimon