diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-26 19:17:48 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-26 19:17:48 +0000 |
commit | 2d337c88b07b6a67b24f4bff4d72025d9ea412a5 (patch) | |
tree | 969e6448476201c49e4c8d5fe228474f51e39fd7 /crates/ra_syntax/src/grammar/expressions.rs | |
parent | 1662eb1f8dd9be765a5675f7062236c78b9c991d (diff) | |
parent | 7a76433c45b01e969f1eca51aec76db53b9e4db3 (diff) |
Merge #680
680: Struct literals should not be a `BlockLike::Block` r=DJMcNab a=DJMcNab
Fix #674.
Co-authored-by: DJMcNab <[email protected]>
Diffstat (limited to 'crates/ra_syntax/src/grammar/expressions.rs')
-rw-r--r-- | crates/ra_syntax/src/grammar/expressions.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_syntax/src/grammar/expressions.rs b/crates/ra_syntax/src/grammar/expressions.rs index 7ee32fa7c..1604d9b5a 100644 --- a/crates/ra_syntax/src/grammar/expressions.rs +++ b/crates/ra_syntax/src/grammar/expressions.rs | |||
@@ -423,7 +423,7 @@ fn path_expr(p: &mut Parser, r: Restrictions) -> (CompletedMarker, BlockLike) { | |||
423 | match p.current() { | 423 | match p.current() { |
424 | L_CURLY if !r.forbid_structs => { | 424 | L_CURLY if !r.forbid_structs => { |
425 | named_field_list(p); | 425 | named_field_list(p); |
426 | (m.complete(p, STRUCT_LIT), BlockLike::Block) | 426 | (m.complete(p, STRUCT_LIT), BlockLike::NotBlock) |
427 | } | 427 | } |
428 | EXCL => { | 428 | EXCL => { |
429 | let block_like = items::macro_call_after_excl(p); | 429 | let block_like = items::macro_call_after_excl(p); |