Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lang/semgrep-grammars/src/semgrep-rust/grammar.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ const standard_grammar = require('tree-sitter-rust/grammar');
module.exports = grammar(standard_grammar, {
name: 'rust',

conflicts: ($, previous) => previous.concat([
[$._non_delim_token, $.ellipsis],
[$._token_pattern, $.ellipsis],
]),

rules: {

// Entry point
Expand Down
33 changes: 14 additions & 19 deletions lang/semgrep-grammars/src/semgrep-rust/test/corpus/semgrep.txt
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ let $L = $X.iter(). ... .count();
(field_identifier))
(arguments))))


================================================================================
Ellipsis for attribute arguments
================================================================================
Expand All @@ -221,24 +220,20 @@ Ellipsis for attribute arguments
--------------------------------------------------------------------------------

(source_file
(attribute_item
(attribute
(identifier)
(token_tree
(ellipsis))))
(attribute_item
(attribute
(identifier)
(token_tree
(identifier)
(ellipsis))))
(attribute_item
(attribute
(identifier)
(token_tree
(ellipsis)
(identifier)
(ellipsis)))))
(attribute_item
(attribute
(identifier)
(token_tree)))
(attribute_item
(attribute
(identifier)
(token_tree
(identifier))))
(attribute_item
(attribute
(identifier)
(token_tree
(identifier)))))

================================================================================
Toplevel expression
Expand Down
2 changes: 1 addition & 1 deletion lang/semgrep-grammars/src/tree-sitter-rust
Submodule tree-sitter-rust updated 69 files
+46 −0 .editorconfig
+0 −20 .eslintrc.js
+34 −7 .gitattributes
+15 −0 .github/FUNDING.yml
+8 −0 .github/dependabot.yml
+44 −26 .github/workflows/ci.yml
+6 −9 .github/workflows/fuzz.yml
+13 −6 .github/workflows/lint.yml
+31 −99 .github/workflows/publish.yml
+40 −9 .gitignore
+0 −6 .npmignore
+58 −0 CMakeLists.txt
+199 −0 Cargo.lock
+13 −7 Cargo.toml
+94 −0 Makefile
+16 −0 Package.resolved
+28 −30 Package.swift
+21 −17 README.md
+17 −6 binding.gyp
+16 −0 bindings/c/tree-sitter-rust.h
+10 −0 bindings/c/tree-sitter-rust.pc.in
+13 −0 bindings/go/binding.go
+15 −0 bindings/go/binding_test.go
+14 −22 bindings/node/binding.cc
+9 −0 bindings/node/binding_test.js
+28 −0 bindings/node/index.d.ts
+7 −15 bindings/node/index.js
+11 −0 bindings/python/tests/test_binding.py
+37 −0 bindings/python/tree_sitter_rust/__init__.py
+7 −0 bindings/python/tree_sitter_rust/__init__.pyi
+27 −0 bindings/python/tree_sitter_rust/binding.c
+0 −0 bindings/python/tree_sitter_rust/py.typed
+0 −36 bindings/rust/README.md
+13 −10 bindings/rust/build.rs
+25 −36 bindings/rust/lib.rs
+2 −2 bindings/swift/TreeSitterRust/rust.h
+12 −0 bindings/swift/TreeSitterRustTests/TreeSitterRustTests.swift
+5 −0 eslint.config.mjs
+175 −118 examples/ast.rs
+29 −2 examples/weird-exprs.rs
+7 −0 go.mod
+34 −0 go.sum
+249 −114 grammar.js
+1,483 −0 package-lock.json
+50 −36 package.json
+33 −0 pyproject.toml
+16 −10 queries/highlights.scm
+1 −1 queries/tags.scm
+0 −21 script/fetch-examples
+0 −0 script/known_failures.txt
+0 −20 script/parse-examples
+0 −3 script/rustc-parse
+62 −0 setup.py
+1,285 −393 src/grammar.json
+474 −198 src/node-types.json
+162,284 −141,120 src/parser.c
+322 −115 src/scanner.c
+54 −0 src/tree_sitter/alloc.h
+291 −0 src/tree_sitter/array.h
+77 −14 src/tree_sitter/parser.h
+62 −0 test/corpus/async.txt
+450 −67 test/corpus/declarations.txt
+68 −22 test/corpus/expressions.txt
+38 −16 test/corpus/literals.txt
+25 −7 test/corpus/macros.txt
+121 −27 test/corpus/patterns.txt
+201 −3 test/corpus/source_files.txt
+4 −2 test/corpus/types.txt
+53 −0 tree-sitter.json