/rust

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

Make resuming generators unsafe instead of the creation of immovable generators #49194

Merged
merged 1 commit into from Mar 24, 2018

Conversation

Reviewers

@cramertj cramertj

Assignees

@cramertj cramertj

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
5 participants
@Zoxc @rust-highfive @cramertj @bors @withoutboats
@Zoxc
Contributor

Zoxc commented Mar 20, 2018 •
edited by estebank

cc @withoutboats

Fixes #47787

@rust-highfive rust-highfive assigned cramertj Mar 20, 2018

@rust-highfive

This comment has been minimized.

Sign in to view
Collaborator

rust-highfive commented Mar 20, 2018

r? @cramertj

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review label Mar 20, 2018

@estebank estebank changed the title Make resuming generators unsafe instead of the creation of immovable generators. Fixes #47787 Make resuming generators unsafe instead of the creation of immovable generators Mar 20, 2018

@cramertj

This comment has been minimized.

Sign in to view
Member

cramertj commented Mar 20, 2018 •
edited

Awesome! Thanks @Zoxc.

Looks like a few of the tests still need unsafe blocks around their calls to resume.

@withoutboats withoutboats added S-waiting-on-author and removed S-waiting-on-review labels Mar 20, 2018

@Zoxc Zoxc force-pushed the Zoxc:unsafe-generator branch 4 times, most recently from 496c585 to 55d73db Mar 20, 2018

@Zoxc

This comment has been minimized.

Sign in to view
Contributor

Zoxc commented Mar 20, 2018

Travis passes now.
@cramertj

cramertj reviewed Mar 20, 2018
View changes

src/test/run-pass/generator/iterator-count.rs
@@ -18,7 +18,7 @@ impl<T: Generator<Return = ()>> Iterator for W<T> {
type Item = T::Yield;

fn next(&mut self) -> Option<Self::Item> {
match self.0.resume() {
match unsafe { self.0.resume() } {

This comment has been minimized.

Sign in to view
Copy link
@cramertj

cramertj Mar 20, 2018 •
edited

Member

This impl isn't actually sound anymore since the iterator can move-- can you leave a comment? (I think it's fine to leave it because the Pin version will come soon, but there should probably be a note about it)
@cramertj

This comment has been minimized.

Sign in to view
Member

cramertj commented Mar 20, 2018

@bors r+

The Iterator for W<impl Generator> isn't sound anymore, but it's in a test (which correctly uses it without moving, so no UB will result) and will be replaced shortly, so I think it's fine to leave as-is.
@bors

This comment has been minimized.

Sign in to view
Contributor

bors commented Mar 20, 2018

📌 Commit 55d73db has been approved by cramertj

@bors bors added S-waiting-on-bors and removed S-waiting-on-author labels Mar 20, 2018

@Zoxc Zoxc force-pushed the Zoxc:unsafe-generator branch from 55d73db to 57896ab Mar 20, 2018

@Zoxc

This comment has been minimized.

Sign in to view
Contributor

Zoxc commented Mar 20, 2018

@bors r=cramertj

@cramertj I already added a comment =P
@bors

This comment has been minimized.

Sign in to view
Contributor

bors commented Mar 20, 2018

📌 Commit 57896ab has been approved by cramertj
@cramertj

This comment has been minimized.

Sign in to view
Member

cramertj commented Mar 20, 2018

I already added a comment =P

Nice :)

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 23, 2018

@alexcrichton
Rollup merge of rust-lang#49194 - Zoxc:unsafe-generator, r=cramertj 
Make resuming generators unsafe instead of the creation of immovable generators

cc @withoutboats

Fixes rust-lang#47787
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
23ce530

@alexcrichton alexcrichton referenced this pull request Mar 23, 2018

Closed

Rollup of 20 pull requests #49317

bors added a commit that referenced this pull request Mar 24, 2018

@bors
Auto merge of #49317 - alexcrichton:rollup, r=alexcrichton 
Rollup of 20 pull requests

- Successful merges: #48482, #49046, #49089, #49101, #49121, #49122, #49141, #49193, #49194, #49203, #49235, #49249, #49254, #49273, #49274, #49284, #49290, #49311, #49312, #49314
- Failed merges: #49162
Loading status checks…
d12349a

bors added a commit that referenced this pull request Mar 24, 2018

@bors
Auto merge of #49317 - alexcrichton:rollup, r=alexcrichton 
Rollup of 20 pull requests

- Successful merges: #48482, #49046, #49089, #49101, #49121, #49122, #49141, #49193, #49194, #49203, #49235, #49249, #49254, #49273, #49274, #49284, #49290, #49311, #49312, #49314
- Failed merges: #49162
Loading status checks…
4accd60

kennytm added a commit to kennytm/rust that referenced this pull request Mar 24, 2018

@kennytm
Rollup merge of rust-lang#49194 - Zoxc:unsafe-generator, r=cramertj 
Make resuming generators unsafe instead of the creation of immovable generators

Fixes rust-lang#47787
Verified
This commit was signed with a verified signature.
@kennytm kennytm
GPG key ID: FEF6C8051D0E013C Learn about signing commits
85abb05

@kennytm kennytm referenced this pull request Mar 24, 2018

Closed

Rollup of 21 pull requests #49325

kennytm added a commit to kennytm/rust that referenced this pull request Mar 24, 2018

@kennytm
Rollup merge of rust-lang#49194 - Zoxc:unsafe-generator, r=cramertj 
Make resuming generators unsafe instead of the creation of immovable generators

cc @withoutboats

Fixes rust-lang#47787
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
e2b8922

@kennytm kennytm referenced this pull request Mar 24, 2018

Merged

Rollup of 21 pull requests #49337

bors added a commit that referenced this pull request Mar 24, 2018

@bors
Auto merge of #49337 - kennytm:rollup, r=kennytm 
Rollup of 21 pull requests

- Successful merges: #49046, #49076, #49089, #49120, #49121, #49122, #49162, #49193, #49194, #49203, #49229, #49235, #49254, #49268, #49273, #49274, #49290, #49312, #49314, #49318, #49299
Loading status checks…
f5631d9

@bors bors merged commit 57896ab into rust-lang:master Mar 24, 2018
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Zoxc Zoxc deleted the Zoxc:unsafe-generator branch Mar 24, 2018

@ngg ngg referenced this pull request Mar 25, 2018

Closed

'call to unsafe function requires unsafe function or block' with rustc 1.26.0-nightly (f5631d9ac 2018-03-24) #79

Nemo157 added a commit to Nemo157/futures-await that referenced this pull request Mar 25, 2018

@Nemo157
Update for latest generators changes 
As of rust-lang/rust#49194 it's now unsafe to
resume a generator, but safe to create an immovable generator.

Fixes alexcrichton#74
7896e80

Nemo157 added a commit to Nemo157/futures-await that referenced this pull request Mar 25, 2018

@Nemo157
Update for latest generators changes 
As of rust-lang/rust#49194 it's now unsafe to
resume a generator, but safe to create an immovable generator.

Fixes alexcrichton#74
015aa8d

@PaulGrandperrin PaulGrandperrin referenced this pull request Apr 2, 2018

Closed

ICE: static generator (Broken MIR: generator contains type [...] in MIR, but typeck only knows about for) #49592

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