From 9bac3d639bb75aa72b92842c9b9766ac2c1a09fa Mon Sep 17 00:00:00 2001 From: Luni-4 Date: Tue, 30 Mar 2021 10:59:51 +0200 Subject: [PATCH 1/2] Delete Rust submodule --- .gitmodules | 3 --- Cargo.lock | 11 +++++++++ Cargo.toml | 1 + enums/Cargo.lock | 11 +++++++++ enums/Cargo.toml | 1 + enums/src/macros.rs | 11 ++------- src/macros.rs | 55 +++++++-------------------------------------- tree-sitter-rust | 1 - 8 files changed, 34 insertions(+), 60 deletions(-) delete mode 100644 .gitmodules delete mode 160000 tree-sitter-rust diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 2985b64f5..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "tree-sitter-rust"] - path = tree-sitter-rust - url = https://github.com/tree-sitter/tree-sitter-rust/ diff --git a/Cargo.lock b/Cargo.lock index 6ccf0b001..576ab5899 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1671,6 +1671,7 @@ dependencies = [ "tree-sitter-mozjs", "tree-sitter-preproc", "tree-sitter-python", + "tree-sitter-rust", "tree-sitter-typescript", ] @@ -2223,6 +2224,16 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-rust" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784f7ef9cdbd4c895dc2d4bb785e95b4a5364a602eec803681db83d1927ddf15" +dependencies = [ + "cc", + "tree-sitter", +] + [[package]] name = "tree-sitter-typescript" version = "0.19.0" diff --git a/Cargo.toml b/Cargo.toml index be3a34501..0439ba9fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,6 +35,7 @@ tree-sitter-java = "^0.19" tree-sitter-typescript = "^0.19" tree-sitter-javascript = "^0.19" tree-sitter-python = "^0.19" +tree-sitter-rust = "^0.19" tree-sitter-preproc = { path = "./tree-sitter-preproc", version = "^0.19" } tree-sitter-ccomment = { path = "./tree-sitter-ccomment", version = "^0.19" } tree-sitter-mozcpp = { path = "./tree-sitter-mozcpp", version = "^0.19" } diff --git a/enums/Cargo.lock b/enums/Cargo.lock index d9fd90381..8375cf352 100644 --- a/enums/Cargo.lock +++ b/enums/Cargo.lock @@ -170,6 +170,7 @@ dependencies = [ "tree-sitter-mozjs", "tree-sitter-preproc", "tree-sitter-python", + "tree-sitter-rust", "tree-sitter-typescript", ] @@ -548,6 +549,16 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-rust" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784f7ef9cdbd4c895dc2d4bb785e95b4a5364a602eec803681db83d1927ddf15" +dependencies = [ + "cc", + "tree-sitter", +] + [[package]] name = "tree-sitter-typescript" version = "0.19.0" diff --git a/enums/Cargo.toml b/enums/Cargo.toml index 7114dc79d..2989a69fd 100644 --- a/enums/Cargo.toml +++ b/enums/Cargo.toml @@ -21,6 +21,7 @@ tree-sitter-java = "^0.19" tree-sitter-typescript = "^0.19" tree-sitter-javascript = "^0.19" tree-sitter-python = "^0.19" +tree-sitter-rust = "^0.19" tree-sitter-preproc = { path = "../tree-sitter-preproc", version = "^0.19" } tree-sitter-ccomment = { path = "../tree-sitter-ccomment", version = "^0.19" } tree-sitter-mozcpp = { path = "../tree-sitter-mozcpp", version = "^0.19" } diff --git a/enums/src/macros.rs b/enums/src/macros.rs index 4c974ce70..55775a3c5 100644 --- a/enums/src/macros.rs +++ b/enums/src/macros.rs @@ -21,19 +21,12 @@ macro_rules! mk_get_language { LANG::Tsx => tree_sitter_typescript::language_tsx(), LANG::Javascript => tree_sitter_javascript::language(), LANG::Python => tree_sitter_python::language(), + LANG::Rust => tree_sitter_rust::language(), LANG::Preproc => tree_sitter_preproc::language(), LANG::Ccomment => tree_sitter_ccomment::language(), LANG::Cpp => tree_sitter_mozcpp::language(), LANG::Mozjs => tree_sitter_mozjs::language(), - _ => match lang { - $( - LANG::$camel => { - extern "C" { fn $name() -> Language; } - unsafe { $name() } - }, - )* - } - } + } } }; } diff --git a/src/macros.rs b/src/macros.rs index 9c4ef982b..375ea71e1 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -32,58 +32,17 @@ macro_rules! mk_else_if { #[macro_use] macro_rules! get_language { - (tree_sitter_java) => { - fn get_language() -> Language { - tree_sitter_java::language() - } + (tree_sitter_cpp) => { + tree_sitter_mozcpp::language() }; (tree_sitter_typescript) => { - fn get_language() -> Language { - tree_sitter_typescript::language_typescript() - } + tree_sitter_typescript::language_typescript() }; (tree_sitter_tsx) => { - fn get_language() -> Language { - tree_sitter_typescript::language_tsx() - } - }; - (tree_sitter_javascript) => { - fn get_language() -> Language { - tree_sitter_javascript::language() - } - }; - (tree_sitter_python) => { - fn get_language() -> Language { - tree_sitter_python::language() - } - }; - (tree_sitter_preproc) => { - fn get_language() -> Language { - tree_sitter_preproc::language() - } - }; - (tree_sitter_ccomment) => { - fn get_language() -> Language { - tree_sitter_ccomment::language() - } - }; - (tree_sitter_cpp) => { - fn get_language() -> Language { - tree_sitter_mozcpp::language() - } - }; - (tree_sitter_mozjs) => { - fn get_language() -> Language { - tree_sitter_mozjs::language() - } + tree_sitter_typescript::language_tsx() }; ($name:ident) => { - fn get_language() -> Language { - extern "C" { - pub(crate) fn $name() -> Language; - } - unsafe { $name() } - } + $name::language() }; } @@ -273,7 +232,9 @@ macro_rules! mk_code { LANG::$camel } - get_language!($name); + fn get_language() -> Language { + get_language!($name) + } fn get_lang_name() -> &'static str { stringify!($camel) diff --git a/tree-sitter-rust b/tree-sitter-rust deleted file mode 160000 index 2a5c1ff31..000000000 --- a/tree-sitter-rust +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2a5c1ff31441e2bfcedee7f93bd88794a0cd83b1 From 26f917cc685513a95c4e405102e06b8ad6ed89b2 Mon Sep 17 00:00:00 2001 From: Luni-4 Date: Tue, 30 Mar 2021 12:30:07 +0200 Subject: [PATCH 2/2] enums: Format the code --- enums/src/macros.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/enums/src/macros.rs b/enums/src/macros.rs index 55775a3c5..308ba74e5 100644 --- a/enums/src/macros.rs +++ b/enums/src/macros.rs @@ -15,18 +15,18 @@ macro_rules! mk_enum { macro_rules! mk_get_language { ( $( ($camel:ident, $name:ident) ),* ) => { pub fn get_language(lang: &LANG) -> Language { - match lang { - LANG::Java => tree_sitter_java::language(), - LANG::Typescript => tree_sitter_typescript::language_typescript(), - LANG::Tsx => tree_sitter_typescript::language_tsx(), - LANG::Javascript => tree_sitter_javascript::language(), - LANG::Python => tree_sitter_python::language(), - LANG::Rust => tree_sitter_rust::language(), - LANG::Preproc => tree_sitter_preproc::language(), - LANG::Ccomment => tree_sitter_ccomment::language(), - LANG::Cpp => tree_sitter_mozcpp::language(), - LANG::Mozjs => tree_sitter_mozjs::language(), - } + match lang { + LANG::Java => tree_sitter_java::language(), + LANG::Typescript => tree_sitter_typescript::language_typescript(), + LANG::Tsx => tree_sitter_typescript::language_tsx(), + LANG::Javascript => tree_sitter_javascript::language(), + LANG::Python => tree_sitter_python::language(), + LANG::Rust => tree_sitter_rust::language(), + LANG::Preproc => tree_sitter_preproc::language(), + LANG::Ccomment => tree_sitter_ccomment::language(), + LANG::Cpp => tree_sitter_mozcpp::language(), + LANG::Mozjs => tree_sitter_mozjs::language(), + } } }; }