.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: Build/test
+on:
+  push:
+    branches:
+      - "**"
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [macos-latest, ubuntu-latest]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
+      - run: npm install
+      - run: npm test
+  test_windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
+      - run: npm install
+      - run: npm run-script test-windows

.gitignore

@@ -1,6 +1,8 @@
+Cargo.lock
 node_modules
 build
 *.log
 package-lock.json
 examples
 !examples/ast.rs
+/target/

.npmignore

@@ -2,4 +2,4 @@ corpus
 build
 script
 examples
-
+target

Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "tree-sitter-rust"
+description = "Rust grammar for the tree-sitter parsing library"
+version = "0.20.1"
+authors = ["Max Brunsfeld <maxbrunsfeld@gmail.com>"]
+license = "MIT"
+readme = "bindings/rust/README.md"
+keywords = ["incremental", "parsing", "rust"]
+categories = ["parsing", "text-editors"]
+repository = "https://github.com/tree-sitter/tree-sitter-rust"
+edition = "2018"
+
+build = "bindings/rust/build.rs"
+include = [
+  "bindings/rust/*",
+  "grammar.js",
+  "queries/*",
+  "src/*",
+]
+autoexamples = false
+
+[lib]
+path = "bindings/rust/lib.rs"
+
+[dependencies]
+tree-sitter = "0.20"
+
+[build-dependencies]
+cc = "1.0"

README.md

@@ -1,7 +1,6 @@
 # tree-sitter-rust
 
-[![Build Status](https://travis-ci.org/tree-sitter/tree-sitter-rust.svg?branch=master)](https://travis-ci.org/tree-sitter/tree-sitter-rust)
-[![Build status](https://ci.appveyor.com/api/projects/status/q57l49j9ancaw0fs/branch/master?svg=true)](https://ci.appveyor.com/project/maxbrunsfeld/tree-sitter-rust/branch/master)
+[![Build/test](https://github.com/tree-sitter/tree-sitter-rust/actions/workflows/ci.yml/badge.svg)](https://github.com/tree-sitter/tree-sitter-rust/actions/workflows/ci.yml)
 
 Rust grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter)
 

binding.gyp

@@ -9,7 +9,7 @@
       "sources": [
         "src/parser.c",
         "src/scanner.c",
-        "src/binding.cc"
+        "bindings/node/binding.cc"
       ],
       "cflags_c": [
         "-std=c99",

bindings/node/index.js

@@ -0,0 +1,19 @@
+try {
+  module.exports = require("../../build/Release/tree_sitter_rust_binding");
+} catch (error1) {
+  if (error1.code !== 'MODULE_NOT_FOUND') {
+    throw error1;
+  }
+  try {
+    module.exports = require("../../build/Debug/tree_sitter_rust_binding");
+  } catch (error2) {
+    if (error2.code !== 'MODULE_NOT_FOUND') {
+      throw error2;
+    }
+    throw error1
+  }
+}
+
+try {
+  module.exports.nodeTypeInfo = require("../../src/node-types.json");
+} catch (_) {}

bindings/rust/README.md

@@ -0,0 +1,37 @@
+# tree-sitter-rust
+
+This crate provides a Rust grammar for the [tree-sitter][] parsing library.  To
+use this crate, add it to the `[dependencies]` section of your `Cargo.toml`
+file.  (Note that you will probably also need to depend on the
+[`tree-sitter`][tree-sitter crate] crate to use the parsed result in any useful
+way.)
+
+``` toml
+[dependencies]
+tree-sitter = "0.17"
+tree-sitter-rust = "0.16"
+```
+
+Typically, you will use the [language][language func] function to add this
+grammar to a tree-sitter [Parser][], and then use the parser to parse some code:
+
+``` rust
+let code = r#"
+    fn double(x: i32) -> i32 {
+        x * 2
+    }
+"#;
+let mut parser = Parser::new();
+parser.set_language(tree_sitter_rust::language()).expect("Error loading Rust grammar");
+let parsed = parser.parse(code, None);
+```
+
+If you have any questions, please reach out to us in the [tree-sitter
+discussions] page.
+
+[Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
+[language func]: https://docs.rs/tree-sitter-rust/*/tree_sitter_rust/fn.language.html
+[Parser]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Parser.html
+[tree-sitter]: https://tree-sitter.github.io/
+[tree-sitter crate]: https://crates.io/crates/tree-sitter
+[tree-sitter discussions]: https://github.com/tree-sitter/tree-sitter/discussions

bindings/rust/build.rs

@@ -0,0 +1,16 @@
+fn main() {
+    let src_dir = std::path::Path::new("src");
+    let mut config = cc::Build::new();
+    config.include(&src_dir);
+    config
+        .flag_if_supported("-Wno-unused-parameter")
+        .flag_if_supported("-Wno-unused-but-set-variable")
+        .flag_if_supported("-Wno-trigraphs");
+    let parser_path = src_dir.join("parser.c");
+    let scanner_path = src_dir.join("scanner.c");
+    println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
+    println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
+    config.file(&parser_path);
+    config.file(&scanner_path);
+    config.compile("parser-scanner");
+}

bindings/rust/lib.rs

@@ -0,0 +1,66 @@
+// -*- coding: utf-8 -*-
+// ------------------------------------------------------------------------------------------------
+// Copyright © 2021, tree-sitter-rust authors.
+// See the LICENSE file in this repo for license details.
+// ------------------------------------------------------------------------------------------------
+
+//! This crate provides a Rust grammar for the [tree-sitter][] parsing library.
+//!
+//! Typically, you will use the [language][language func] function to add this grammar to a
+//! tree-sitter [Parser][], and then use the parser to parse some code:
+//!
+//! ```
+//! use tree_sitter::Parser;
+//!
+//! let code = r#"
+//!     fn double(x: i32) -> i32 {
+//!         x * 2
+//!     }
+//! "#;
+//! let mut parser = Parser::new();
+//! parser.set_language(tree_sitter_rust::language()).expect("Error loading Rust grammar");
+//! let parsed = parser.parse(code, None);
+//! # let parsed = parsed.unwrap();
+//! # let root = parsed.root_node();
+//! # assert!(!root.has_error());
+//! ```
+//!
+//! [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
+//! [language func]: fn.language.html
+//! [Parser]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Parser.html
+//! [tree-sitter]: https://tree-sitter.github.io/
+
+use tree_sitter::Language;
+
+extern "C" {
+    fn tree_sitter_rust() -> Language;
+}
+
+/// Returns the tree-sitter [Language][] for this grammar.
+///
+/// [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
+pub fn language() -> Language {
+    unsafe { tree_sitter_rust() }
+}
+
+/// The source of the Rust tree-sitter grammar description.
+pub const GRAMMAR: &str = include_str!("../../grammar.js");
+
+/// The syntax highlighting query for this language.
+pub const HIGHLIGHT_QUERY: &str = include_str!("../../queries/highlights.scm");
+
+/// The content of the [`node-types.json`][] file for this grammar.
+///
+/// [`node-types.json`]: https://tree-sitter.github.io/tree-sitter/using-parsers#static-node-types
+pub const NODE_TYPES: &str = include_str!("../../src/node-types.json");
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn can_load_grammar() {
+        let mut parser = tree_sitter::Parser::new();
+        parser
+            .set_language(super::language())
+            .expect("Error loading Rust grammar");
+    }
+}

corpus/async.txt

@@ -1,71 +1,88 @@
-============================================
+================================================================================
 Async function
-============================================
+================================================================================
 
 async fn abc() {}
 
 async fn main() {
     let x = futures.await?;
 }
 
----
+--------------------------------------------------------------------------------
 
 (source_file
   (function_item
     (function_modifiers)
     (identifier)
     (parameters)
     (block))
-  (function_item (function_modifiers) (identifier) (parameters)
+  (function_item
+    (function_modifiers)
+    (identifier)
+    (parameters)
     (block
-      (let_declaration (identifier) (try_expression
-        (await_expression (identifier)))))))
+      (let_declaration
+        (identifier)
+        (try_expression
+          (await_expression
+            (identifier)))))))
 
-============================================
+================================================================================
 Await expression
-============================================
+================================================================================
 
 futures.await;
 futures.await?;
 futures.await?.await?;
 futures.await?.function().await?;
 
----
+--------------------------------------------------------------------------------
 
 (source_file
-  (await_expression (identifier))
-  (try_expression
-    (await_expression (identifier)))
-  (try_expression
+  (expression_statement
     (await_expression
-      (try_expression
-        (await_expression (identifier)))))
-  (try_expression
-    (await_expression
-      (call_expression
-        (field_expression
-          (try_expression
-            (await_expression (identifier)))
-          (field_identifier))
-        (arguments)))))
+      (identifier)))
+  (expression_statement
+    (try_expression
+      (await_expression
+        (identifier))))
+  (expression_statement
+    (try_expression
+      (await_expression
+        (try_expression
+          (await_expression
+            (identifier))))))
+  (expression_statement
+    (try_expression
+      (await_expression
+        (call_expression
+          (field_expression
+            (try_expression
+              (await_expression
+                (identifier)))
+            (field_identifier))
+          (arguments))))))
 
-============================================
+================================================================================
 Async Block
-============================================
+================================================================================
 
 async {}
 async { let x = 10; }
 async move {}
 
----
+--------------------------------------------------------------------------------
 
 (source_file
-  (async_block
-    (block))
-  (async_block
-    (block
-      (let_declaration
-        (identifier)
-        (integer_literal))))
-  (async_block
-    (block)))
+  (expression_statement
+    (async_block
+      (block)))
+  (expression_statement
+    (async_block
+      (block
+        (let_declaration
+          (identifier)
+          (integer_literal)))))
+  (expression_statement
+    (async_block
+      (block))))