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

Remove ScopeTarget and LoopIdResult #50750

Merged
merged 3 commits into from
May 16, 2018
Merged

Remove ScopeTarget and LoopIdResult #50750

merged 3 commits into from
May 16, 2018

Conversation

est31
Copy link
Member

@est31 est31 commented May 14, 2018

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 14, 2018
@@ -3730,7 +3730,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
tcx.mk_nil()
}
hir::ExprBreak(destination, ref expr_opt) => {
if let Some(target_id) = destination.target_id.opt_id() {
if let Some(target_id) = destination.target_id.ok() {
Copy link
Member

Choose a reason for hiding this comment

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

This can pattern-match on Ok instead.

@eddyb
Copy link
Member

eddyb commented May 15, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented May 15, 2018

📌 Commit f7a0800 has been approved by eddyb

@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 15, 2018
@bors
Copy link
Collaborator

bors commented May 15, 2018

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

@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 May 15, 2018
est31 added 3 commits May 15, 2018 15:47
When we want to implement label-break-value,
we can't really decide whether to emit ScopeTarget::Loop or
ScopeTarget::Block in the code that is supposed to create it.
So we get rid of it and reconstruct the information when
needed.
It's redundant as Result already implements Encodable
as well as Decodable.
@est31
Copy link
Member Author

est31 commented May 15, 2018

rebased. re-r? @eddyb

@eddyb
Copy link
Member

eddyb commented May 15, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented May 15, 2018

📌 Commit 4d328f7 has been approved by eddyb

@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 May 15, 2018
@kennytm
Copy link
Member

kennytm commented May 15, 2018

@bors p=1

Needed to unblock #50045

@bors
Copy link
Collaborator

bors commented May 16, 2018

⌛ Testing commit 4d328f7 with merge 75a0049...

bors added a commit that referenced this pull request May 16, 2018
 Remove ScopeTarget and LoopIdResult

* Remove ScopeTarget in preparation of label-break-value (PR #50045)
* Replace LoopIdResult by Result which is possible now thanks to commit 8ac65af " Implement Encodable and Decodable for Result."

r? @eddyb
@bors
Copy link
Collaborator

bors commented May 16, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: eddyb
Pushing 75a0049 to master...

@bors bors merged commit 4d328f7 into rust-lang:master May 16, 2018
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.

5 participants