Remove ScopeTarget and LoopIdResult #50750
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
eddyb
suggested changes
May 15, 2018
src/librustc_typeck/check/mod.rs
Outdated
| @@ -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() { | |||
There was a problem hiding this comment.
This can pattern-match on Ok instead.
eddyb
approved these changes
May 15, 2018
|
@bors r+ |
|
📌 Commit f7a0800 has been approved by |
bors
added
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #50351) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
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.
|
rebased. re-r? @eddyb |
|
@bors r+ |
|
📌 Commit 4d328f7 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @eddyb