diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-02 20:20:24 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-09-02 20:20:24 +0100 |
| commit | 7faec1c30046769d4ae490e15cf5405bcfbdeef8 (patch) | |
| tree | 6d268b721027a5350928a6c5a0ec227b5fde8ebc /crates/ra_parser/src/grammar.rs | |
| parent | a8397deab914240aca8f015fb3736689919c0a5b (diff) | |
| parent | e94587e3153b52684fd3f6b82c8e7efc09ff5c8d (diff) | |
Merge #1752
1752: Always wrap blocks into block expressions r=flodiebold a=matklad
This way, things like function bodies are expressions, and we don't have to single them out
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_parser/src/grammar.rs')
| -rw-r--r-- | crates/ra_parser/src/grammar.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs index d0f0dd4ac..be9419e0c 100644 --- a/crates/ra_parser/src/grammar.rs +++ b/crates/ra_parser/src/grammar.rs | |||
| @@ -144,7 +144,7 @@ pub(crate) fn reparser( | |||
| 144 | parent: Option<SyntaxKind>, | 144 | parent: Option<SyntaxKind>, |
| 145 | ) -> Option<fn(&mut Parser)> { | 145 | ) -> Option<fn(&mut Parser)> { |
| 146 | let res = match node { | 146 | let res = match node { |
| 147 | BLOCK => expressions::block, | 147 | BLOCK => expressions::naked_block, |
| 148 | RECORD_FIELD_DEF_LIST => items::record_field_def_list, | 148 | RECORD_FIELD_DEF_LIST => items::record_field_def_list, |
| 149 | RECORD_FIELD_LIST => items::record_field_list, | 149 | RECORD_FIELD_LIST => items::record_field_list, |
| 150 | ENUM_VARIANT_LIST => items::enum_variant_list, | 150 | ENUM_VARIANT_LIST => items::enum_variant_list, |