From ca5e268c5234b29d6e6a8f836dfdb7531f849708 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2026 23:09:04 +0000 Subject: [PATCH 01/10] build(deps): update tree-sitter-rust requirement from =0.23.2 to =0.24.2 Updates the requirements on [tree-sitter-rust](https://github.com/tree-sitter/tree-sitter-rust) to permit the latest version. - [Release notes](https://github.com/tree-sitter/tree-sitter-rust/releases) - [Commits](https://github.com/tree-sitter/tree-sitter-rust/compare/v0.23.2...v0.24.2) --- updated-dependencies: - dependency-name: tree-sitter-rust dependency-version: 0.24.2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 7a5c1bda0..659af8f0d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ tree-sitter-kotlin-ng = "1.1.0" tree-sitter-typescript = "=0.23.2" tree-sitter-javascript = "=0.23.1" tree-sitter-python = "=0.23.6" -tree-sitter-rust = "=0.23.2" +tree-sitter-rust = "=0.24.2" tree-sitter-preproc = { path = "./tree-sitter-preproc", version = "=0.20.3" } tree-sitter-ccomment = { path = "./tree-sitter-ccomment", version = "=0.20.3" } tree-sitter-mozcpp = { path = "./tree-sitter-mozcpp", version = "=0.20.4" } From 8786869444d3f3bb9891402a1622c3cef66e0a11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2026 22:53:42 +0000 Subject: [PATCH 02/10] build(deps): update tree-sitter requirement in /tree-sitter-mozjs Updates the requirements on [tree-sitter](https://github.com/tree-sitter/tree-sitter) to permit the latest version. - [Release notes](https://github.com/tree-sitter/tree-sitter/releases) - [Commits](https://github.com/tree-sitter/tree-sitter/compare/v0.25.3...v0.26.8) --- updated-dependencies: - dependency-name: tree-sitter dependency-version: 0.26.8 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- tree-sitter-mozjs/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tree-sitter-mozjs/Cargo.toml b/tree-sitter-mozjs/Cargo.toml index b1f3915fe..caef97fe6 100644 --- a/tree-sitter-mozjs/Cargo.toml +++ b/tree-sitter-mozjs/Cargo.toml @@ -33,4 +33,4 @@ tree-sitter-javascript = "0.23.1" build = ["tree-sitter-javascript"] [dev-dependencies] -tree-sitter = "=0.25.3" +tree-sitter = "=0.26.8" From 7348852643e4cf4c2f497d972b326254bfd28406 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2026 22:53:50 +0000 Subject: [PATCH 03/10] build(deps): update tree-sitter requirement in /tree-sitter-ccomment Updates the requirements on [tree-sitter](https://github.com/tree-sitter/tree-sitter) to permit the latest version. - [Release notes](https://github.com/tree-sitter/tree-sitter/releases) - [Commits](https://github.com/tree-sitter/tree-sitter/compare/v0.25.3...v0.26.8) --- updated-dependencies: - dependency-name: tree-sitter dependency-version: 0.26.8 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- tree-sitter-ccomment/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tree-sitter-ccomment/Cargo.toml b/tree-sitter-ccomment/Cargo.toml index d9df06f4e..5c6b5d118 100644 --- a/tree-sitter-ccomment/Cargo.toml +++ b/tree-sitter-ccomment/Cargo.toml @@ -27,4 +27,4 @@ tree-sitter-language="0.1.0" cc = "^1.0" [dev-dependencies] -tree-sitter = "=0.25.3" +tree-sitter = "=0.26.8" From 00fd0c77391832e933938f6570909fb53d086a24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2026 22:53:52 +0000 Subject: [PATCH 04/10] build(deps): update tree-sitter requirement in /tree-sitter-preproc Updates the requirements on [tree-sitter](https://github.com/tree-sitter/tree-sitter) to permit the latest version. - [Release notes](https://github.com/tree-sitter/tree-sitter/releases) - [Commits](https://github.com/tree-sitter/tree-sitter/compare/v0.25.3...v0.26.8) --- updated-dependencies: - dependency-name: tree-sitter dependency-version: 0.26.8 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- tree-sitter-preproc/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tree-sitter-preproc/Cargo.toml b/tree-sitter-preproc/Cargo.toml index 85a564fce..8d490e42b 100644 --- a/tree-sitter-preproc/Cargo.toml +++ b/tree-sitter-preproc/Cargo.toml @@ -27,4 +27,4 @@ tree-sitter-language="0.1.0" cc = "^1.0" [dev-dependencies] -tree-sitter = "=0.25.3" +tree-sitter = "=0.26.8" From 864f6950a7f3d5ceef7518bd3fad790c0910e1e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2026 22:53:52 +0000 Subject: [PATCH 05/10] build(deps): update tree-sitter requirement in /tree-sitter-mozcpp Updates the requirements on [tree-sitter](https://github.com/tree-sitter/tree-sitter) to permit the latest version. - [Release notes](https://github.com/tree-sitter/tree-sitter/releases) - [Commits](https://github.com/tree-sitter/tree-sitter/compare/v0.25.3...v0.26.8) --- updated-dependencies: - dependency-name: tree-sitter dependency-version: 0.26.8 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- tree-sitter-mozcpp/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tree-sitter-mozcpp/Cargo.toml b/tree-sitter-mozcpp/Cargo.toml index 7924acb47..0002b85af 100644 --- a/tree-sitter-mozcpp/Cargo.toml +++ b/tree-sitter-mozcpp/Cargo.toml @@ -33,4 +33,4 @@ tree-sitter-cpp = "0.23.4" build = ["tree-sitter-cpp"] [dev-dependencies] -tree-sitter = "=0.25.3" +tree-sitter = "=0.26.8" From 4468e3d10f271f13d78b40fdbc6f1b71c92d4c3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2026 22:53:58 +0000 Subject: [PATCH 06/10] build(deps): update tree-sitter requirement in /enums Updates the requirements on [tree-sitter](https://github.com/tree-sitter/tree-sitter) to permit the latest version. - [Release notes](https://github.com/tree-sitter/tree-sitter/releases) - [Commits](https://github.com/tree-sitter/tree-sitter/compare/v0.25.3...v0.26.8) --- updated-dependencies: - dependency-name: tree-sitter dependency-version: 0.26.8 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- enums/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enums/Cargo.toml b/enums/Cargo.toml index d2dcc438e..ee9bea4d1 100644 --- a/enums/Cargo.toml +++ b/enums/Cargo.toml @@ -8,7 +8,7 @@ edition = "2024" clap = { version = "^4.0", features = ["derive"] } askama = "^0.14" -tree-sitter = "=0.25.3" +tree-sitter = "=0.26.8" tree-sitter-java = "=0.23.5" tree-sitter-kotlin-ng = "1.1.0" tree-sitter-typescript = "=0.23.2" From 7714489a204d6efb4ffa4095746b727f072f3f77 Mon Sep 17 00:00:00 2001 From: Roman Fedorov Date: Fri, 22 May 2026 22:41:41 +0300 Subject: [PATCH 07/10] build(deps): update tree-sitter to 0.26.8 across all crates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps tree-sitter from 0.25.3 → 0.26.8 in the main library and all sub-crates (enums, tree-sitter-ccomment, tree-sitter-mozcpp, tree-sitter-mozjs, tree-sitter-preproc), and tree-sitter-rust from 0.23.2 → 0.24.2. Also fixes the one API break introduced in tree-sitter 0.26.x: `Node::child()` now takes `u32` instead of `usize`; added a cast in src/node.rs to keep the wrapper's public signature unchanged. --- Cargo.toml | 2 +- src/node.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 659af8f0d..2ab5020de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ serde = { version = "^1.0", features = ["derive"] } termcolor = "^1.2" walkdir = "^2.3" -tree-sitter = "=0.25.3" +tree-sitter = "=0.26.8" tree-sitter-java = "=0.23.5" tree-sitter-kotlin-ng = "1.1.0" tree-sitter-typescript = "=0.23.2" diff --git a/src/node.rs b/src/node.rs index 49b8df104..2fa1bd9a3 100644 --- a/src/node.rs +++ b/src/node.rs @@ -116,7 +116,7 @@ impl<'a> Node<'a> { } pub(crate) fn child(&self, pos: usize) -> Option> { - self.0.child(pos).map(Node) + self.0.child(pos as u32).map(Node) } pub(crate) fn children(&self) -> impl ExactSizeIterator> + use<'a> { From e393ef915cc02b35cec218ea7498537fc99f069b Mon Sep 17 00:00:00 2001 From: Roman Fedorov Date: Fri, 22 May 2026 22:45:58 +0300 Subject: [PATCH 08/10] build(deps): bump all dependencies to latest compatible versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - tree-sitter 0.25.3 → 0.26.9 - tree-sitter-rust 0.23.2 → 0.24.2 - tree-sitter-javascript 0.23.1 → 0.25.0 - tree-sitter-python 0.23.6 → 0.25.0 - clap ^4.0 → ^4.6, actix-web ^4.2 → ^4.13, actix-rt ^2.6 → ^2.11 - toml ^0.9 → ^1.1, insta 1.29 → 1.47, various patch bumps Applied to all workspace members and sub-crates. Verified clean build. --- Cargo.toml | 18 +++++++++--------- enums/Cargo.toml | 8 ++++---- rust-code-analysis-cli/Cargo.toml | 6 +++--- rust-code-analysis-web/Cargo.toml | 8 ++++---- tree-sitter-ccomment/Cargo.toml | 6 +++--- tree-sitter-mozcpp/Cargo.toml | 6 +++--- tree-sitter-mozjs/Cargo.toml | 8 ++++---- tree-sitter-preproc/Cargo.toml | 6 +++--- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2ab5020de..b098c09df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ description = "Tool to compute and export code metrics" license = "MPL-2.0" [dependencies] -aho-corasick = "^1.0" +aho-corasick = "^1.1" crossbeam = { version = "^0.8", features = ["crossbeam-channel"] } globset = "^0.4" num = "^0.4" @@ -19,17 +19,17 @@ num-derive = "^0.4" num-format = "^0.4" num-traits = "^0.2" petgraph = "^0.8" -regex = "^1.7" +regex = "^1.12" serde = { version = "^1.0", features = ["derive"] } -termcolor = "^1.2" -walkdir = "^2.3" +termcolor = "^1.4" +walkdir = "^2.5" -tree-sitter = "=0.26.8" +tree-sitter = "=0.26.9" tree-sitter-java = "=0.23.5" tree-sitter-kotlin-ng = "1.1.0" tree-sitter-typescript = "=0.23.2" -tree-sitter-javascript = "=0.23.1" -tree-sitter-python = "=0.23.6" +tree-sitter-javascript = "=0.25.0" +tree-sitter-python = "=0.25.0" tree-sitter-rust = "=0.24.2" tree-sitter-preproc = { path = "./tree-sitter-preproc", version = "=0.20.3" } tree-sitter-ccomment = { path = "./tree-sitter-ccomment", version = "=0.20.3" } @@ -37,8 +37,8 @@ tree-sitter-mozcpp = { path = "./tree-sitter-mozcpp", version = "=0.20.4" } tree-sitter-mozjs = { path = "./tree-sitter-mozjs", version = "=0.20.3" } [dev-dependencies] -insta = { version = "1.29.0", features = ["yaml", "json", "redactions"] } -pretty_assertions = "^1.3" +insta = { version = "1.47.2", features = ["yaml", "json", "redactions"] } +pretty_assertions = "^1.4" [profile.dev.package.insta] opt-level = 3 diff --git a/enums/Cargo.toml b/enums/Cargo.toml index ee9bea4d1..6545d2c0c 100644 --- a/enums/Cargo.toml +++ b/enums/Cargo.toml @@ -8,13 +8,13 @@ edition = "2024" clap = { version = "^4.0", features = ["derive"] } askama = "^0.14" -tree-sitter = "=0.26.8" +tree-sitter = "=0.26.9" tree-sitter-java = "=0.23.5" tree-sitter-kotlin-ng = "1.1.0" tree-sitter-typescript = "=0.23.2" -tree-sitter-javascript = "=0.23.1" -tree-sitter-python = "=0.23.6" -tree-sitter-rust = "=0.23.2" +tree-sitter-javascript = "=0.25.0" +tree-sitter-python = "=0.25.0" +tree-sitter-rust = "=0.24.2" tree-sitter-preproc = { path = "../tree-sitter-preproc", version = "=0.20.3" } tree-sitter-ccomment = { path = "../tree-sitter-ccomment", version = "=0.20.3" } tree-sitter-mozcpp = { path = "../tree-sitter-mozcpp", version = "=0.20.4" } diff --git a/rust-code-analysis-cli/Cargo.toml b/rust-code-analysis-cli/Cargo.toml index c276ccff8..10674c11a 100644 --- a/rust-code-analysis-cli/Cargo.toml +++ b/rust-code-analysis-cli/Cargo.toml @@ -12,12 +12,12 @@ license = "MPL-2.0" name = "rust-code-analysis-cli" [dependencies] -clap = { version = "^4.0", features = ["derive"] } +clap = { version = "^4.6", features = ["derive"] } globset = "^0.4" -regex = "^1.7" +regex = "^1.12" rust-code-analysis = { path = "..", version = "=0.0.25" } serde = "^1.0" serde_cbor = "^0.11" serde_json = "^1.0" serde_yaml = "^0.9" -toml = "^0.9" +toml = "^1.1" diff --git a/rust-code-analysis-web/Cargo.toml b/rust-code-analysis-web/Cargo.toml index 6c4edfbe3..1d9fd0635 100644 --- a/rust-code-analysis-web/Cargo.toml +++ b/rust-code-analysis-web/Cargo.toml @@ -9,13 +9,13 @@ description = "Run a web service to compute and export code metrics" license = "MPL-2.0" [dependencies] -actix-rt = "^2.6" -actix-web = "^4.2" -clap = { version = "^4.0", features = ["derive"] } +actix-rt = "^2.11" +actix-web = "^4.13" +clap = { version = "^4.6", features = ["derive"] } futures = "^0.3" rust-code-analysis = { path = "..", version = "=0.0.25" } serde = "^1.0" serde_json = "^1.0" [dev-dependencies] -pretty_assertions = "^1.3" +pretty_assertions = "^1.4" diff --git a/tree-sitter-ccomment/Cargo.toml b/tree-sitter-ccomment/Cargo.toml index 5c6b5d118..74153720d 100644 --- a/tree-sitter-ccomment/Cargo.toml +++ b/tree-sitter-ccomment/Cargo.toml @@ -21,10 +21,10 @@ include = [ path = "bindings/rust/lib.rs" [dependencies] -tree-sitter-language="0.1.0" +tree-sitter-language="0.1.7" [build-dependencies] -cc = "^1.0" +cc = "^1.2" [dev-dependencies] -tree-sitter = "=0.26.8" +tree-sitter = "=0.26.9" diff --git a/tree-sitter-mozcpp/Cargo.toml b/tree-sitter-mozcpp/Cargo.toml index 0002b85af..c2d361dbc 100644 --- a/tree-sitter-mozcpp/Cargo.toml +++ b/tree-sitter-mozcpp/Cargo.toml @@ -21,10 +21,10 @@ include = [ path = "bindings/rust/lib.rs" [dependencies] -tree-sitter-language="0.1.0" +tree-sitter-language="0.1.7" [build-dependencies] -cc = "^1.0" +cc = "^1.2" # This dependency is not used at all for this crate, but it is here so that # dependabot can send notifications when there are updates for this grammar tree-sitter-cpp = "0.23.4" @@ -33,4 +33,4 @@ tree-sitter-cpp = "0.23.4" build = ["tree-sitter-cpp"] [dev-dependencies] -tree-sitter = "=0.26.8" +tree-sitter = "=0.26.9" diff --git a/tree-sitter-mozjs/Cargo.toml b/tree-sitter-mozjs/Cargo.toml index caef97fe6..01cd12e49 100644 --- a/tree-sitter-mozjs/Cargo.toml +++ b/tree-sitter-mozjs/Cargo.toml @@ -21,16 +21,16 @@ include = [ path = "bindings/rust/lib.rs" [dependencies] -tree-sitter-language="0.1.0" +tree-sitter-language="0.1.7" [build-dependencies] -cc = "^1.0" +cc = "^1.2" # This dependency is not used at all for this crate, but it is here so that # dependabot can send notifications when there are updates for this grammar -tree-sitter-javascript = "0.23.1" +tree-sitter-javascript = "0.25.0" [package.metadata.cargo-udeps.ignore] build = ["tree-sitter-javascript"] [dev-dependencies] -tree-sitter = "=0.26.8" +tree-sitter = "=0.26.9" diff --git a/tree-sitter-preproc/Cargo.toml b/tree-sitter-preproc/Cargo.toml index 8d490e42b..a8b5957b0 100644 --- a/tree-sitter-preproc/Cargo.toml +++ b/tree-sitter-preproc/Cargo.toml @@ -21,10 +21,10 @@ include = [ path = "bindings/rust/lib.rs" [dependencies] -tree-sitter-language="0.1.0" +tree-sitter-language="0.1.7" [build-dependencies] -cc = "^1.0" +cc = "^1.2" [dev-dependencies] -tree-sitter = "=0.26.8" +tree-sitter = "=0.26.9" From fc2b7edb4381407dc2eef32d8b0f06f11a2e7b5c Mon Sep 17 00:00:00 2001 From: Roman Fedorov Date: Fri, 22 May 2026 22:49:07 +0300 Subject: [PATCH 09/10] build(deps): replace deprecated serde_yaml with serde_yml 0.0.12 --- rust-code-analysis-cli/Cargo.toml | 2 +- rust-code-analysis-cli/src/formats.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rust-code-analysis-cli/Cargo.toml b/rust-code-analysis-cli/Cargo.toml index 10674c11a..abb35020b 100644 --- a/rust-code-analysis-cli/Cargo.toml +++ b/rust-code-analysis-cli/Cargo.toml @@ -19,5 +19,5 @@ rust-code-analysis = { path = "..", version = "=0.0.25" } serde = "^1.0" serde_cbor = "^0.11" serde_json = "^1.0" -serde_yaml = "^0.9" +serde_yml = "0.0.12" toml = "^1.1" diff --git a/rust-code-analysis-cli/src/formats.rs b/rust-code-analysis-cli/src/formats.rs index 2f5a3a54a..a4f764bf5 100644 --- a/rust-code-analysis-cli/src/formats.rs +++ b/rust-code-analysis-cli/src/formats.rs @@ -212,7 +212,7 @@ struct Yaml; impl WriteOnStdout for Yaml { fn format(content: T) -> String { - serde_yaml::to_string(&content).unwrap() + serde_yml::to_string(&content).unwrap() } } @@ -220,7 +220,7 @@ impl WriteFile for Yaml { const EXTENSION: &'static str = ".yml"; fn with_writer(content: T, path: PathBuf, output_path: &Path) { - serde_yaml::to_writer(Self::open_file(path, output_path), &content).unwrap() + serde_yml::to_writer(Self::open_file(path, output_path), &content).unwrap() } } From 2c59d6506891948c87f380b8f17be7c00c047d6e Mon Sep 17 00:00:00 2001 From: Roman Fedorov Date: Fri, 22 May 2026 23:10:43 +0300 Subject: [PATCH 10/10] =?UTF-8?q?fix:=20revert=20tree-sitter-rust=20to=200?= =?UTF-8?q?.23.2=20=E2=80=94=20language=5Frust.rs=20not=20regenerated=20fo?= =?UTF-8?q?r=200.24.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Node IDs in language_rust.rs (e.g. FunctionItem=186) were generated from the 0.23.2 grammar. Updating to 0.24.2 without regenerating the file via the enums/ tool causes all Rust function nodes to be misidentified, making metrics() return no function-level spaces. Revert to 0.23.2 until the enum file is regenerated from the new grammar. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b098c09df..897e8e673 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ tree-sitter-kotlin-ng = "1.1.0" tree-sitter-typescript = "=0.23.2" tree-sitter-javascript = "=0.25.0" tree-sitter-python = "=0.25.0" -tree-sitter-rust = "=0.24.2" +tree-sitter-rust = "=0.23.2" tree-sitter-preproc = { path = "./tree-sitter-preproc", version = "=0.20.3" } tree-sitter-ccomment = { path = "./tree-sitter-ccomment", version = "=0.20.3" } tree-sitter-mozcpp = { path = "./tree-sitter-mozcpp", version = "=0.20.4" }