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

Fix more escaping ReScopes #60765

Merged
merged 3 commits into from
May 13, 2019
Merged

Fix more escaping ReScopes #60765

merged 3 commits into from
May 13, 2019

Conversation

matthewjasper
Copy link
Contributor

Closes #58840

@matthewjasper
Always use the stronger outlives version for opaque types
664c8ed
@matthewjasper
Treat generators the same as closure for escaping lifetimes
1f5145e
@matthewjasper
Don't allow any ReScope in impl trait types
9a4f0ab 
This shouldn't be possible any more, but if it does happen, emit an
error rather than maybe panicking later when NLL finds a the ReScope.
Impl trait in bindings is sufficiently broken that I don't think this
breaks anything that works for it.
@rust-highfive
Copy link
Collaborator

r? @oli-obk

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 12, 2019
@oli-obk
Copy link
Contributor

oli-obk commented May 13, 2019

@bors r+

@bors
Copy link
Contributor

bors commented May 13, 2019

📌 Commit 9a4f0ab has been approved by oli-obk

@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 May 13, 2019
@bors
Copy link
Contributor

bors commented May 13, 2019

⌛ Testing commit 9a4f0ab with merge 69ef8fb...

bors added a commit that referenced this pull request May 13, 2019
@bors
Auto merge of #60765 - matthewjasper:fix-more-escaping-rescopes, r=ol…
69ef8fb 
…i-obk

Fix more escaping ReScopes

Closes #58840
@bors
Copy link
Contributor

bors commented May 13, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 69ef8fb to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 13, 2019
@bors bors merged commit 9a4f0ab into rust-lang:master May 13, 2019
@bors bors mentioned this pull request May 13, 2019
Merged
@davidpdrsn davidpdrsn mentioned this pull request May 14, 2019
Merged
@jsgf
Copy link
Contributor

jsgf commented May 14, 2019

Will this be in 1.35?

@matthewjasper matthewjasper deleted the fix-more-escaping-rescopes branch May 17, 2019 19:26
@matthewjasper matthewjasper added the stable-nominated Nominated for backporting to the compiler in the stable channel. label May 18, 2019
@matthewjasper matthewjasper mentioned this pull request May 18, 2019
Merged
@pietroalbini pietroalbini added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 28, 2019
@pnkfelix pnkfelix added the stable-accepted Accepted for backporting to the compiler in the stable channel. label Jun 6, 2019
@pnkfelix
Copy link
Member

pnkfelix commented Jun 6, 2019

discussed in T-compiler meeting. Accepted for backport to stable channel.

@Centril
Copy link
Contributor

Centril commented Jun 11, 2019

Discussed on T-release meeting; declining point release for now based on sum-total of stable-accepted.

@Mark-Simulacrum Mark-Simulacrum removed stable-nominated Nominated for backporting to the compiler in the stable channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Jul 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rustc 1.33 stable panicked on a closure inside a closure
9 participants
@matthewjasper @rust-highfive @oli-obk @bors @jsgf @pnkfelix @Centril @pietroalbini @Mark-Simulacrum