From 69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71 Mon Sep 17 00:00:00 2001 From: Access Date: Thu, 20 Jun 2024 13:32:15 +0800 Subject: [PATCH] chore: update rust bindings (#27) --- bindings/rust/build.rs | 5 ++--- bindings/rust/lib.rs | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/bindings/rust/build.rs b/bindings/rust/build.rs index a786311..d753f66 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.std("c11").include(src_dir); c_config .flag_if_supported("-Wno-unused-parameter") .flag_if_supported("-Wno-unused-but-set-variable") @@ -17,6 +17,5 @@ fn main() { 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()); + c_config.compile("tree-sitter-cmake"); } diff --git a/bindings/rust/lib.rs b/bindings/rust/lib.rs index 53d49ca..5c9a849 100644 --- a/bindings/rust/lib.rs +++ b/bindings/rust/lib.rs @@ -4,10 +4,12 @@ //! tree-sitter [Parser][], and then use the parser to parse some code: //! //! ``` -//! let code = ""; +//! let code = r#" +//! "#; //! let mut parser = tree_sitter::Parser::new(); -//! parser.set_language(tree_sitter_cmake::language()).expect("Error loading cmake grammar"); +//! parser.set_language(&tree_sitter_cmake::language()).expect("Error loading cmake grammar"); //! let tree = parser.parse(code, None).unwrap(); +//! assert!(!tree.root_node().has_error()); //! ``` //! //! [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html @@ -31,14 +33,14 @@ pub fn language() -> Language { /// 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: &'static str = include_str!("../../src/node-types.json"); +pub const NODE_TYPES: &str = include_str!("../../src/node-types.json"); // Uncomment these to include any queries that this grammar contains -// pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm"); -// pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm"); -// pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm"); -// pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm"); +// pub const HIGHLIGHTS_QUERY: &str = include_str!("../../queries/highlights.scm"); +// pub const INJECTIONS_QUERY: &str = include_str!("../../queries/injections.scm"); +// pub const LOCALS_QUERY: &str = include_str!("../../queries/locals.scm"); +// pub const TAGS_QUERY: &str = include_str!("../../queries/tags.scm"); #[cfg(test)] mod tests { @@ -46,7 +48,7 @@ mod tests { fn test_can_load_grammar() { let mut parser = tree_sitter::Parser::new(); parser - .set_language(super::language()) - .expect("Error loading cmake language"); + .set_language(&super::language()) + .expect("Error loading cmake grammar"); } }