Skip to content

[NLL] Propagate bounds from generators - #55013

Merged
bors merged 1 commit into
rust-lang:masterfrom
matthewjasper:propagate-generator-bounds
Oct 19, 2018
Merged

[NLL] Propagate bounds from generators#55013
bors merged 1 commit into
rust-lang:masterfrom
matthewjasper:propagate-generator-bounds

Conversation

@matthewjasper

@matthewjaspermatthewjasper commented Oct 12, 2018

Copy link
Copy Markdown
Contributor

This used to only be done for closures.

r? @nikomatsakis

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 12, 2018
@memoryruinsmemoryruins added the A-NLL Area: Non-lexical lifetimes (NLL) label Oct 12, 2018
@matthewjasper
matthewjasperforce-pushed the propagate-generator-bounds branch from 5bb5e2c to 4627eb9CompareOctober 13, 2018 09:13
@nikomatsakis

nikomatsakis commented Oct 16, 2018

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 16, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 4627eb9d55710b09e8a2f24888dd8d7e3ea27270 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 16, 2018
@nikomatsakis

nikomatsakis commented Oct 16, 2018

Copy link
Copy Markdown
Contributor

Good catch.

@bors

bors commented Oct 17, 2018

Copy link
Copy Markdown
Collaborator

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

@borsbors 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 Oct 17, 2018
@matthewjasper
matthewjasperforce-pushed the propagate-generator-bounds branch from 4627eb9 to b95f7dbCompareOctober 17, 2018 19:30
@matthewjasper

matthewjasper commented Oct 17, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors r=nikomatsakis

@bors

bors commented Oct 17, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit b95f7dbcdcfbae7abe1c060bf8839254e3438e26 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 17, 2018
@kennytmkennytm mentioned this pull request Oct 18, 2018
Closed
@matthewjasper
matthewjasperforce-pushed the propagate-generator-bounds branch from b95f7db to ef1a40dCompareOctober 18, 2018 21:48
@matthewjasper

matthewjasper commented Oct 18, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors r=nikomatsakis

@bors

bors commented Oct 18, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit ef1a40d has been approved by nikomatsakis

@bors

bors commented Oct 19, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ef1a40d with merge 5906face9984dcab3528d430193b6d3247749ab3...

@bors

bors commented Oct 19, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@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 19, 2018
@rust-highfive

rust-highfive commented Oct 19, 2018

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-tools of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:16fc9ee4:start=1539931080547300831,finish=1539931080554698599,duration=7397768
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0c551f48
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0e3bebbe
travis_time:start:0e3bebbe
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0d2b7bf0
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@kennytm

kennytm commented Oct 19, 2018

Copy link
Copy Markdown
Member

@bors retry travis-ci/travis-ci#9696

@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 19, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Oct 19, 2018
@kennytm
Rollup merge ofrust-lang#55013- matthewjasper:propagate-generator-b…
0724efd
…ounds, r=nikomatsakis
[NLL] Propagate bounds from generators
This used to only be done for closures.
@kennytmkennytm mentioned this pull request Oct 19, 2018
Merged
bors added a commit that referenced this pull request Oct 19, 2018
@bors
Auto merge of#55194- kennytm:rollup, r=kennytm
74ff7dc
Rollup of 7 pull requests
Successful merges:
- #54300 (Updated RELEASES.md for 1.30.0)
- #55013 ([NLL] Propagate bounds from generators)
- #55071 (Fix ICE and report a human readable error)
- #55144 (Cleanup resolve)
- #55166 (Don't warn about parentheses on `match (return)`)
- #55169 (Add a `copysign` function to f32 and f64)
- #55178 (Stabilize slice::chunks_exact(), chunks_exact_mut(), rchunks(), rchunks_mut(), rchunks_exact(), rchunks_exact_mut())
@bors
bors merged commit ef1a40d into rust-lang:masterOct 19, 2018
@matthewjasper
matthewjasper deleted the propagate-generator-bounds branch October 21, 2018 16:19
@SimonSapinSimonSapin mentioned this pull request Oct 22, 2018
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis approved these changes

Assignees

@nikomatsakisnikomatsakis

Labels

A-NLLArea: Non-lexical lifetimes (NLL)S-waiting-on-borsStatus: 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.

6 participants

@matthewjasper@nikomatsakis@bors@rust-highfive@kennytm@memoryruins