[function-grep] Bumped tree sitter version

Also a little bit of listening to clippy

Author: mendelsshop

cargo-function-history/Cargo.toml

@@ -14,7 +14,6 @@ rust-version = "1.76.0"
 [features]
 default = ["parallel"]
 parallel = ["git_function_history/parallel", "function_history_backend_thread/parallel"]
-# c_lang = ["function_history_backend_thread/c_lang", "git_function_history/c_lang"]
 
 [dependencies]
 git_function_history = { path = "../git-function-history-lib", version = "0.7.1", default-features = false}

function-grep/Cargo.toml

@@ -23,19 +23,19 @@ go = ["dep:tree-sitter-go"]
 c-sharp = ["dep:tree-sitter-c-sharp"]
 
 [dependencies]
-tree-sitter = ">=0.21.0"
-tree-sitter-c = { version = "0.21.4", optional = true }
-tree-sitter-java = { version = "0.21.0", optional = true }
-tree-sitter-ocaml = { version = "0.21.2", optional = true }
-tree-sitter-python = { version = "0.21.0", optional = true }
-tree-sitter-ruby = { version = "0.21.0", optional = true }
-tree-sitter-go = { version = "0.21.2", optional = true }
-tree-sitter-c-sharp = { version = "0.21.3", optional = true }
-tree-sitter-rust = { version = "0.21.2", optional = true }
-tree-sitter-tags = "0.21"
+tree-sitter = ">=0.23.0"
+tree-sitter-c = { version = "0.23.0", optional = true }
+tree-sitter-java = { version = "0.23.2", optional = true }
+tree-sitter-ocaml = { version = "0.23.0", optional = true }
+tree-sitter-python = { version = "0.23.2", optional = true }
+tree-sitter-ruby = { version = "0.23.0", optional = true }
+tree-sitter-go = { version = "0.23.1", optional = true }
+tree-sitter-c-sharp = { version = "0.23.0", optional = true }
+tree-sitter-rust = { version = "0.23.0", optional = true }
+tree-sitter-tags = "0.23"
 
 [dev-dependencies]
-clap = { version = "4.5.7", features = ["derive"] }
+clap = { version = "4.5.16", features = ["derive"] }
 
 [[example]]
 name = "function-grep"

function-grep/src/filter/filter_parsers.rs

@@ -1,18 +1,18 @@
-pub(crate) fn number<'a>(
+pub fn number<'a>(
     substring: &mut impl Iterator<Item = &'a str>,
     format: &str,
     position: &str,
 ) -> Result<usize, String> {
     substring.next().ok_or_else(||format! ("invalid options for function_in_lines filter\nexpected {format}\n missing {position} [number]"))
                 .and_then(|end| end.parse().map_err(|_| format! ("invalid options for function_in_lines filter\nexpected {format}\n cannot parse {position} [number]")))
 }
-pub(crate) fn extra<'a>(
+pub fn extra<'a>(
     substring: &mut impl Iterator<Item = &'a str>,
     format: &str,
 ) -> Result<(), String> {
     substring.next().map_or(Ok(()), |extra| Err(format!( "invalid options for function_in_lines filter\nexpected {format}\n, found extra stuff after {format}: {extra}")))
 }
-pub(crate) fn label<'a>(
+pub fn label<'a>(
     substring: &mut impl Iterator<Item = &'a str>,
     format: &str,
     label: &str,

function-grep/src/filter/general_filters.rs

@@ -5,7 +5,8 @@ use tree_sitter::Node;
 use crate::SupportedLanguages;
 
 use super::{
-    filter_parsers::*, Attribute, AttributeType, Filter, FilterFunction, HasFilterInformation,
+    filter_parsers::{extra, label, number},
+    Attribute, AttributeType, Filter, FilterFunction, HasFilterInformation,
 };
 
 pub struct FunctionInLines;

function-grep/src/supported_languages.rs

@@ -235,7 +235,7 @@ macro_rules! construct_language {
             }
 
             fn language(&self) -> TsLanguage {
-                $tslang
+                $tslang.into()
             }
         }
         impl Assoc for $name {
@@ -266,7 +266,7 @@ macro_rules! construct_language {
             }
 
             fn language(&self) -> TsLanguage {
-                $tslang
+                $tslang.into()
             }
         }
         impl Assoc for $name {
@@ -282,7 +282,7 @@ macro_rules! construct_language {
 
 #[cfg(feature = "c")]
 
-construct_language!(C(tree_sitter_c::language()).[c h]?=
+construct_language!(C(tree_sitter_c::LANGUAGE).[c h]?=
    name ->  "((function_definition
  declarator:
  (function_declarator declarator: (identifier) @method-name))
@@ -296,12 +296,12 @@ construct_language!(C(tree_sitter_c::language()).[c h]?=
 
 #[cfg(feature = "ruby")]
 // TODO: also query for anonymous functions assigned to variables
-construct_language!(Ruby(tree_sitter_ruby::language()).[rb] ?= "method-name" =>
+construct_language!(Ruby(tree_sitter_ruby::LANGUAGE).[rb] ?= "method-name" =>
 "((method name: (identifier) @method-name) @method-definition)");
 
 #[cfg(feature = "c-sharp")]
 // TODO: also query for anonymous functions assigned to variables
-construct_language!(CSharp(tree_sitter_c_sharp::language()).[cs] ?= "method-name" =>
+construct_language!(CSharp(tree_sitter_c_sharp::LANGUAGE).[cs] ?= "method-name" =>
 "((local_function_statement name: (identifier) @method-name) @method)
 ((method_declaration name: (identifier) @method-name) @method)"
 
@@ -327,10 +327,10 @@ construct_language!(CSharp(tree_sitter_c_sharp::language()).[cs] ?= "method-name
 // ((var_declaration (var_spec name: (identifier) @method-name )))
 // ((const_declaration))
 // ((short_var_declaration))
-construct_language!(Go(tree_sitter_go::language()).[go] ?= "method-name" =>
+construct_language!(Go(tree_sitter_go::LANGUAGE).[go] ?= "method-name" =>
 "((function_declaration name: (identifier) @method-name) @method-definition)");
 #[cfg(feature = "rust")]
-construct_language!(Rust(tree_sitter_rust::language()).[rs] ?= "method-name" =>
+construct_language!(Rust(tree_sitter_rust::LANGUAGE).[rs] ?= "method-name" =>
 
             "((function_item
   name: (identifier) @method-name)
@@ -351,7 +351,7 @@ construct_language!(Rust(tree_sitter_rust::language()).[rs] ?= "method-name" =>
 );
 
 #[cfg(feature = "python")]
-construct_language!(Python(tree_sitter_python::language()).[py]?= "method-name" =>
+construct_language!(Python(tree_sitter_python::LANGUAGE).[py]?= "method-name" =>
 
             "((function_definition
  name: (identifier) @method-name)
@@ -365,7 +365,7 @@ construct_language!(Python(tree_sitter_python::language()).[py]?= "method-name"
 );
 
 #[cfg(feature = "java")]
-construct_language!(Java(tree_sitter_java::language()).[java]?="method-name" =>
+construct_language!(Java(tree_sitter_java::LANGUAGE).[java]?="method-name" =>
 "((method_declaration
  name: (identifier) @method-name)
  @method-definition

function_history_backend_thread/Cargo.toml

@@ -15,7 +15,6 @@ rust-version = "1.76.0"
 [features]
 default = ["parallel"]
 parallel = ["git_function_history/parallel"]
-# c_lang = ["git_function_history/c_lang"]
 
 [dependencies]
 git_function_history = { path = "../git-function-history-lib", version = "0.7.1", default-features = false}

git-function-history-gui/Cargo.toml

@@ -14,7 +14,6 @@ rust-version = "1.79.0"
 [features]
 default = ["parallel"]
 parallel = ["git_function_history/parallel", "function_history_backend_thread/parallel"]
-# c_lang = ["git_function_history/c_lang", "function_history_backend_thread/c_lang"]
 
 [dependencies]
 eframe = {version = "0.28.1"}

git-function-history-lib/Cargo.toml

@@ -24,7 +24,6 @@ chrono = "0.4.38"
 rayon = { version = "1.10.0", optional = true }
 cfg-if = "1.0.0"
 cached = { version = "0.53.1", optional = true }
-# git-index-performanc
 gix = { version = "0.66.0", default-features = false, features = [
     "max-performance-safe",
     "revision",

git-function-history-lib/src/lib.rs

@@ -338,7 +338,7 @@ fn traverse_tree(
     langs: &[&InstatiatedLanguage<'_>],
     filetype: &FileFilterType,
 ) -> Result<Vec<ParsedFile>, String> {
-    let mut files_exts_iter = file_exts.iter();
+    let files_exts_iter = file_exts.iter();
     let treee_iter = tree.iter();
     let mut files: Vec<_> = Vec::new();
     let mut ret = Vec::new();
@@ -581,7 +581,7 @@ mod tests {
         match &output {
             Ok(functions) => {
                 println!("{functions}");
-                println!("{:?}", functions.get_metadata())
+                println!("{:?}", functions.get_metadata());
             }
             Err(e) => println!("{e}"),
         }