diff --git a/lang/semgrep-grammars/src/semgrep-rust/grammar.js b/lang/semgrep-grammars/src/semgrep-rust/grammar.js
index 290a130a..d954fd8e 100644
--- a/lang/semgrep-grammars/src/semgrep-rust/grammar.js
+++ b/lang/semgrep-grammars/src/semgrep-rust/grammar.js
@@ -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
diff --git a/lang/semgrep-grammars/src/semgrep-rust/test/corpus/semgrep.txt b/lang/semgrep-grammars/src/semgrep-rust/test/corpus/semgrep.txt
index b0fdf376..33965fe6 100644
--- a/lang/semgrep-grammars/src/semgrep-rust/test/corpus/semgrep.txt
+++ b/lang/semgrep-grammars/src/semgrep-rust/test/corpus/semgrep.txt
@@ -209,7 +209,6 @@ let $L = $X.iter(). ... .count();
         (field_identifier))
       (arguments))))
 
-
 ================================================================================
 Ellipsis for attribute arguments
 ================================================================================
@@ -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
diff --git a/lang/semgrep-grammars/src/tree-sitter-rust b/lang/semgrep-grammars/src/tree-sitter-rust
index 79456e60..3691201b 160000
--- a/lang/semgrep-grammars/src/tree-sitter-rust
+++ b/lang/semgrep-grammars/src/tree-sitter-rust
@@ -1 +1 @@
-Subproject commit 79456e6080f50fc1ca7c21845794308fa5d35a51
+Subproject commit 3691201b01cacb2f96ffca4c632c4e938bfacd88