Skip to content

Commit 5218c67

Browse files
authored
Merge pull request #459 from semgrep/nmote/rust1
chore: Update tree-sitter-rust (1/n)
2 parents 38d8ef5 + c4e674d commit 5218c67

File tree

3 files changed

+27
-21
lines changed

3 files changed

+27
-21
lines changed

lang/semgrep-grammars/src/semgrep-rust/grammar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = grammar(standard_grammar, {
4646
},
4747

4848
// Statement ellipsis: '...' not followed by ';'
49-
_expression_statement: ($, previous) => {
49+
expression_statement: ($, previous) => {
5050
return choice(
5151
previous,
5252
prec.right(100, seq($.ellipsis, ';')), // expression ellipsis

lang/semgrep-grammars/src/semgrep-rust/test/corpus/semgrep.txt

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ impl $CLASS {
2727
(type_identifier)))
2828
(type_identifier)
2929
(block
30-
(if_expression
31-
(identifier)
32-
(block
33-
(identifier))
34-
(else_clause
30+
(expression_statement
31+
(if_expression
32+
(identifier)
3533
(block
36-
(identifier)))))))))
34+
(identifier))
35+
(else_clause
36+
(block
37+
(identifier))))))))))
3738

3839
================================================================================
3940
Typed Metavariables
@@ -44,12 +45,13 @@ x == ($Y : String);
4445
--------------------------------------------------------------------------------
4546

4647
(source_file
47-
(binary_expression
48-
(identifier)
49-
(parenthesized_expression
50-
(semgrep_typed_metavar
51-
(identifier)
52-
(type_identifier)))))
48+
(expression_statement
49+
(binary_expression
50+
(identifier)
51+
(parenthesized_expression
52+
(semgrep_typed_metavar
53+
(identifier)
54+
(type_identifier))))))
5355

5456
================================================================================
5557
Ellipsis for expression
@@ -76,7 +78,8 @@ impl Foo {
7678
(let_declaration
7779
(identifier)
7880
(integer_literal))
79-
(ellipsis)
81+
(expression_statement
82+
(ellipsis))
8083
(let_declaration
8184
(identifier)
8285
(integer_literal)))))))
@@ -106,7 +109,8 @@ impl Foo {
106109
(let_declaration
107110
(identifier)
108111
(integer_literal))
109-
(ellipsis)
112+
(expression_statement
113+
(ellipsis))
110114
(let_declaration
111115
(identifier)
112116
(integer_literal)))))))
@@ -314,10 +318,11 @@ foo($...X);
314318
--------------------------------------------------------------------------------
315319

316320
(source_file
317-
(call_expression
318-
(identifier)
319-
(arguments
320-
(identifier))))
321+
(expression_statement
322+
(call_expression
323+
(identifier)
324+
(arguments
325+
(identifier)))))
321326

322327
================================================================================
323328
Statement metavariable ellipsis
@@ -328,4 +333,5 @@ $...X;
328333
--------------------------------------------------------------------------------
329334

330335
(source_file
331-
(identifier))
336+
(expression_statement
337+
(identifier)))

0 commit comments

Comments
 (0)