Recover out of an enum or struct's braced block. #37245
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nrc (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
|
PR looks good. Could you add an extra test or two which have legal and illegal nesting of |
| fields.push(self.parse_struct_decl_field()?); | ||
| fields.push(self.parse_struct_decl_field().map_err(|e| { | ||
| self.recover_stmt(); | ||
| self.eat(&token::CloseDelim(token::Brace)); |
There was a problem hiding this comment.
Do we need to consume a } explicitly here?
If we leave the } unconsumed, it looks like we'd break out of the while loop and the } would get consumed by the self.bump(); call below.
There was a problem hiding this comment.
Perhaps I should make this into a match to make it clearer. If there's an error then we'll hit an early return out of the function (? below).
There was a problem hiding this comment.
Ahh yes, my bad. This is good as is, I was just confused.
If we encounter a syntax error inside of a braced block, then we should fail by consuming the rest of the block if possible. This implements such recovery for enums and structs. Fixes rust-lang#37113.
|
I added another test, although I'm not totally sure what you mean by "legal and illegal nesting". |
|
@bors: r+ |
|
📌 Commit c9036cc has been approved by |
Recover out of an enum or struct's braced block. If we encounter a syntax error inside of a braced block, then we should fail by consuming the rest of the block if possible. This implements such recovery for enums and structs. Fixes #37113.
If we encounter a syntax error inside of a braced block, then we should
fail by consuming the rest of the block if possible.
This implements such recovery for enums and structs.
Fixes #37113.