diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-10-03 16:03:29 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-10-03 16:03:29 +0100 |
| commit | 7d1bb35fb179b7e55ceb9c5354d9d74bffb8ca63 (patch) | |
| tree | 9a6b2a477a371499f7a9012b26bf639acd801cb6 /crates/ra_syntax/src/grammar.ron | |
| parent | e1c367595139f109fb6f53811bed7d67a384793e (diff) | |
| parent | 9638adaa40d22adcf9b4002d95a13977c0f1436f (diff) | |
Merge #1950
1950: Fix parsing of block expressions in "forbid_structs" contexts. r=kjeremy a=goffrie
Forbidding block expressions entirely is too strict; instead, we should only
forbid them in contexts where we are parsing an optional RHS (i.e. the RHS of a
range expression).
Fixes #1773.
Co-authored-by: Geoffry Song <[email protected]>
Diffstat (limited to 'crates/ra_syntax/src/grammar.ron')
| -rw-r--r-- | crates/ra_syntax/src/grammar.ron | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron index 30328f59f..17477a696 100644 --- a/crates/ra_syntax/src/grammar.ron +++ b/crates/ra_syntax/src/grammar.ron | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | // Stores definitions which must be used in multiple places | 1 | // Stores definitions which must be used in multiple places |
| 2 | // See `cargo gen-syntax` (defined in crates/tools/src/main.rs) | 2 | // See `cargo gen-syntax` (defined in crates/ra_tools/src/main.rs) |
| 3 | Grammar( | 3 | Grammar( |
| 4 | punct: [ | 4 | punct: [ |
| 5 | (";", "SEMI"), | 5 | (";", "SEMI"), |