Merge remote-tracking branch 'upstream/main' into error-recovery-sepa…

…rated
Xanewok · Sep 20, 2023 · c122f29 · c122f29
2 parents ddfd506 + 25fcdc4
commit c122f29
Show file tree

Hide file tree

Showing 4 changed files with 3,414 additions and 4,212 deletions.
diff --git a/crates/codegen/parser/generator/src/parser_definition.rs b/crates/codegen/parser/generator/src/parser_definition.rs
@@ -70,12 +70,10 @@ impl ParserDefinitionNodeExtensions for ParserDefinitionNode {
                         })
                         .collect::<Vec<_>>();
                     quote! {
-                        {
-                            SequenceHelper::run(|mut seq| {
-                                #(#parsers)*
-                                seq.finish()
-                            })
-                        }
+                        SequenceHelper::run(|mut seq| {
+                            #(#parsers)*
+                            seq.finish()
+                        })
                     }
                 }
             }
@@ -95,12 +93,10 @@ impl ParserDefinitionNodeExtensions for ParserDefinitionNode {
                     })
                     .collect::<Vec<_>>();
                 quote! {
-                    {
-                        ChoiceHelper::run(input, |mut choice, input| {
-                            #(#parsers)*
-                            choice.finish(input)
-                        })
-                    }
+                    ChoiceHelper::run(input, |mut choice, input| {
+                        #(#parsers)*
+                        choice.finish(input)
+                    })
                 }
             }
 

diff --git a/crates/codegen/parser/generator/src/precedence_parser_definition.rs b/crates/codegen/parser/generator/src/precedence_parser_definition.rs
@@ -164,12 +164,10 @@ impl PrecedenceParserDefinitionNodeExtensions for PrecedenceParserDefinitionNode
                 .map(|parser| quote! { seq.elem(#parser)?; })
                 .collect::<Vec<_>>();
             quote! {
-                {
-                    SequenceHelper::run(|mut seq| {
-                        #(#parsers)*
-                        seq.finish()
-                    })
-                }
+                SequenceHelper::run(|mut seq| {
+                    #(#parsers)*
+                    seq.finish()
+                })
             }
         }
 
@@ -187,12 +185,10 @@ impl PrecedenceParserDefinitionNodeExtensions for PrecedenceParserDefinitionNode
                 })
                 .collect::<Vec<_>>();
             quote! {
-                {
-                    ChoiceHelper::run(input, |mut choice, input| {
-                        #(#parsers)*
-                        choice.finish(input)
-                    })
-                }
+                ChoiceHelper::run(input, |mut choice, input| {
+                    #(#parsers)*
+                    choice.finish(input)
+                })
             }
         }