Addressed #51602 #53360
Merged
Addressed #51602 #53360
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
|
LGTM. I'll await for the ping. |
estebank
reviewed
Aug 14, 2018
src/libsyntax/parse/parser.rs
Outdated
| let mut do_not_suggest_help = false; | ||
| if self.token.is_keyword(keywords::In) || self.token == token::Colon { | ||
| do_not_suggest_help = true; | ||
| } | ||
| let mut e = self.span_fatal(sp, &format!("expected `{{`, found `{}`", tok)); |
There was a problem hiding this comment.
While you're doing this, could you add this here?
e.span_label(sp, "expected `{`");
There was a problem hiding this comment.
@estebank sure!
PramodBisht
force-pushed
the
issue/51602
branch
from
f93a7e4 to
b70be5b
Compare
|
@estebank all test cases passed. |
|
@bors r+ rollup |
|
📌 Commit b70be5b has been approved by |
bors
added
S-waiting-on-bors
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Aug 16, 2018
Addressed rust-lang#51602 Fixed rust-lang#51602 r? @estebank here I have addressed the case where `in` was not expected right after `if` block. Speaking of `type ascription` I am not sure if this the best approach which I have implemented. Plus I think one more test case can be added to test `type-ascription` case, though I don't have any at this point of time. I will ping you again if all existing testcases pass.
bors
added a commit
that referenced
this pull request
Aug 16, 2018
Rollup of 10 pull requests Successful merges: - #52946 (Documented impl From on line 367 of libserialize/json.rs) - #53234 (Remove Travis shutdown debug scripts, and remove CI-specific DNS settings) - #53313 (Two small improvements) - #53360 (Addressed #51602) - #53364 (Warn if the user tries to use GATs) - #53373 (Tweak unclosed delimiter parser error) - #53377 (std: Use target_pointer_width for BACKTRACE_ELF_SIZE) - #53395 (Use #[non_exhaustive] on internal enums) - #53399 (Tidy: ignore non-Markdown files when linting for the Unstable Book) - #53412 (syntax_ext: remove leftover span_err_if_not_stage0 macro.)
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.
Fixed #51602
r? @estebank
here I have addressed the case where
inwas not expected right afterifblock. Speaking oftype ascriptionI am not sure if this the best approach which I have implemented. Plus I think one more test case can be added to testtype-ascriptioncase, though I don't have any at this point of time. I will ping you again if all existing testcases pass.