From b5539065432c08e4118eb3ee7c94902fdda85708 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 19 Jun 2023 02:15:41 -0400
Subject: [PATCH] chore: update bindings & ci workflow

---
 .github/workflows/build.yaml |  4 ++--
 Cargo.toml                   |  9 ++-------
 Package.swift                |  2 +-
 binding.gyp                  |  2 +-
 bindings/rust/build.rs       | 18 +-----------------
 5 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 99d5f65..103c10a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        compiler: [gcc, clang++]
+        compiler: [gcc, clang]
 
     name: compile
     runs-on: ${{ matrix.os }}
@@ -19,4 +19,4 @@ jobs:
         uses: egor-tensin/setup-mingw@v2
 
       - name: build
-        run: ${{ matrix.compiler }} -o scanner.o -I./src -c src/scanner.cc -Werror
+        run: ${{ matrix.compiler }} -o scanner.o -I./src -c src/scanner.c -Werror
diff --git a/Cargo.toml b/Cargo.toml
index e9ef247..d0b9dc6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,18 +9,13 @@ edition = "2018"
 license = "Apache"
 
 build = "bindings/rust/build.rs"
-include = [
-  "bindings/rust/*",
-  "grammar.js",
-  "queries/*",
-  "src/*",
-]
+include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]
 
 [lib]
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = "~0.20"
+tree-sitter = "~0.20.10"
 
 [build-dependencies]
 cc = "1.0"
diff --git a/Package.swift b/Package.swift
index db40578..e1944bf 100644
--- a/Package.swift
+++ b/Package.swift
@@ -30,7 +30,7 @@ let package = Package(
                 ],
                 sources: [
                     "src/parser.c",
-                    "src/scanner.cc",
+                    "src/scanner.c",
                 ],
                 publicHeadersPath: "bindings/swift",
                 cSettings: [.headerSearchPath("src")],
diff --git a/binding.gyp b/binding.gyp
index f135dc0..5a766d1 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -9,7 +9,7 @@
       "sources": [
         "bindings/node/binding.cc",
         "src/parser.c",
-        # If your language uses an external scanner, add it here.
+        "src/scanner.c",
       ],
       "cflags_c": [
         "-std=c99",
diff --git a/bindings/rust/build.rs b/bindings/rust/build.rs
index 673642f..8851fed 100644
--- a/bindings/rust/build.rs
+++ b/bindings/rust/build.rs
@@ -2,7 +2,7 @@ fn main() {
     let src_dir = std::path::Path::new("src");
 
     let mut c_config = cc::Build::new();
-    c_config.include(&src_dir);
+    c_config.include(src_dir);
     c_config
         .flag_if_supported("-Wno-unused-parameter")
         .flag_if_supported("-Wno-unused-but-set-variable")
@@ -10,26 +10,10 @@ fn main() {
     let parser_path = src_dir.join("parser.c");
     c_config.file(&parser_path);
 
-    // If your language uses an external scanner written in C,
-    // then include this block of code:
-
-    /*
     let scanner_path = src_dir.join("scanner.c");
     c_config.file(&scanner_path);
     println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
-    */
 
     c_config.compile("parser");
     println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
-
-    let mut cpp_config = cc::Build::new();
-    cpp_config.cpp(true);
-    cpp_config.include(&src_dir);
-    cpp_config
-        .flag_if_supported("-Wno-unused-parameter")
-        .flag_if_supported("-Wno-unused-but-set-variable");
-    let scanner_path = src_dir.join("scanner.cc");
-    cpp_config.file(&scanner_path);
-    cpp_config.compile("scanner");
-    println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
 }