Update to latest tree-sitter Rust parser on crates.io

Wilfred · Jan 26, 2025 · 6f35d13 · 6f35d13
1 parent 8fcfdae
commit 6f35d13
Show file tree

Hide file tree

Showing 50 changed files with 19 additions and 181,787 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,8 @@ effect since 0.46.
 File detection now supports Windows-1252 encoded test (an extension of
 ISO-8859-1), and is stricter about UTF-16 detection.
 
-Updated to the latest tree-sitter parser for LaTeX, Make and YAML.
+Updated to the latest tree-sitter parser for LaTeX, Make, Rust and
+YAML.
 
 ## 0.62 (released 20th December 2024)
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -98,6 +98,7 @@ tree-sitter-xml = "0.7.0"
 tree-sitter-make = "1.1.1"
 tree-sitter-yaml = "0.7.0"
 encoding_rs = "0.8.35"
+tree-sitter-rust = "0.23.2"
 
 [dev-dependencies]
 # assert_cmd 2.0.10 requires predicates 3.

diff --git a/build.rs b/build.rs
@@ -197,11 +197,6 @@ fn main() {
             src_dir: "vendored_parsers/tree-sitter-racket-src",
             extra_files: vec!["scanner.c"],
         },
-        TreeSitterParser {
-            name: "tree-sitter-rust",
-            src_dir: "vendored_parsers/tree-sitter-rust-src",
-            extra_files: vec!["scanner.c"],
-        },
         TreeSitterParser {
             name: "tree-sitter-scheme",
             src_dir: "vendored_parsers/tree-sitter-scheme-src",

diff --git a/src/parse/tree_sitter_parser.rs b/src/parse/tree_sitter_parser.rs
@@ -88,7 +88,6 @@ extern "C" {
     fn tree_sitter_qmljs() -> ts::Language;
     fn tree_sitter_r() -> ts::Language;
     fn tree_sitter_racket() -> ts::Language;
-    fn tree_sitter_rust() -> ts::Language;
     fn tree_sitter_scheme() -> ts::Language;
     fn tree_sitter_smali() -> ts::Language;
     fn tree_sitter_scss() -> ts::Language;
@@ -917,16 +916,15 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         Rust => {
-            let language = unsafe { tree_sitter_rust() };
+            let language_fn = tree_sitter_rust::LANGUAGE;
+            let language = tree_sitter::Language::new(language_fn);
+
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: vec!["char_literal", "string_literal"].into_iter().collect(),
                 delimiter_tokens: vec![("{", "}"), ("(", ")"), ("[", "]"), ("|", "|"), ("<", ">")],
-                highlight_query: ts::Query::new(
-                    &language,
-                    include_str!("../../vendored_parsers/highlights/rust.scm"),
-                )
-                .unwrap(),
+                highlight_query: ts::Query::new(&language, tree_sitter_rust::HIGHLIGHTS_QUERY)
+                    .unwrap(),
                 sub_languages: vec![],
             }
         }

diff --git a/vendored_parsers/highlights/rust.scm b/vendored_parsers/highlights/rust.scm
diff --git a/vendored_parsers/tree-sitter-rust-src b/vendored_parsers/tree-sitter-rust-src
diff --git a/vendored_parsers/tree-sitter-rust/.eslintrc.js b/vendored_parsers/tree-sitter-rust/.eslintrc.js
diff --git a/vendored_parsers/tree-sitter-rust/.gitattributes b/vendored_parsers/tree-sitter-rust/.gitattributes
diff --git a/vendored_parsers/tree-sitter-rust/.github/workflows/ci.yml b/vendored_parsers/tree-sitter-rust/.github/workflows/ci.yml
diff --git a/vendored_parsers/tree-sitter-rust/.github/workflows/fuzz.yml b/vendored_parsers/tree-sitter-rust/.github/workflows/fuzz.yml
diff --git a/vendored_parsers/tree-sitter-rust/.github/workflows/lint.yml b/vendored_parsers/tree-sitter-rust/.github/workflows/lint.yml
diff --git a/vendored_parsers/tree-sitter-rust/.github/workflows/publish.yml b/vendored_parsers/tree-sitter-rust/.github/workflows/publish.yml
diff --git a/vendored_parsers/tree-sitter-rust/.gitignore b/vendored_parsers/tree-sitter-rust/.gitignore
diff --git a/vendored_parsers/tree-sitter-rust/.gitmodules b/vendored_parsers/tree-sitter-rust/.gitmodules
diff --git a/vendored_parsers/tree-sitter-rust/.npmignore b/vendored_parsers/tree-sitter-rust/.npmignore
diff --git a/vendored_parsers/tree-sitter-rust/Cargo.toml b/vendored_parsers/tree-sitter-rust/Cargo.toml
diff --git a/vendored_parsers/tree-sitter-rust/LICENSE b/vendored_parsers/tree-sitter-rust/LICENSE