From 0e4edb55cf532379b6764d329fe9c8b043f0222c Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 21:54:25 +0000 Subject: [PATCH 1/4] test: update bash test replacer string to use variable Co-authored-by: bashandbone <89049923+bashandbone@users.noreply.github.com> --- crates/language/src/bash.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/language/src/bash.rs b/crates/language/src/bash.rs index 3cc19b4..72573a7 100644 --- a/crates/language/src/bash.rs +++ b/crates/language/src/bash.rs @@ -39,7 +39,6 @@ fn test_bash_pattern_no_match() { #[test] fn test_bash_replace() { - // TODO: change the replacer to log $A - let ret = test_replace("echo 123", "echo $A", "log 123"); + let ret = test_replace("echo 123", "echo $A", "log $A"); assert_eq!(ret, "log 123"); } From 43750e2c7707ee9ee458e24a84c16cbab7efd7d3 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 22:07:20 +0000 Subject: [PATCH 2/4] fix: collapse nested if block in flow analyzer Co-authored-by: bashandbone <89049923+bashandbone@users.noreply.github.com> --- crates/flow/src/incremental/analyzer.rs | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/crates/flow/src/incremental/analyzer.rs b/crates/flow/src/incremental/analyzer.rs index e6cb845..9b33262 100644 --- a/crates/flow/src/incremental/analyzer.rs +++ b/crates/flow/src/incremental/analyzer.rs @@ -471,21 +471,21 @@ impl IncrementalAnalyzer { } // Save edges to storage in batch - if !edges_to_save.is_empty() { - if let Err(e) = self.storage.save_edges_batch(&edges_to_save).await { - warn!( - error = %e, - "batch save failed, falling back to individual saves" - ); - for edge in &edges_to_save { - if let Err(e) = self.storage.save_edge(edge).await { - warn!( - file_from = ?edge.from, - file_to = ?edge.to, - error = %e, - "failed to save edge individually" - ); - } + if !edges_to_save.is_empty() + && let Err(e) = self.storage.save_edges_batch(&edges_to_save).await + { + warn!( + error = %e, + "batch save failed, falling back to individual saves" + ); + for edge in &edges_to_save { + if let Err(e) = self.storage.save_edge(edge).await { + warn!( + file_from = ?edge.from, + file_to = ?edge.to, + error = %e, + "failed to save edge individually" + ); } } } From 6447238943496973ad91ec351dfa0e3d9252979e Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 22:21:21 +0000 Subject: [PATCH 3/4] fix: resolve typo errors in CI checks Co-authored-by: bashandbone <89049923+bashandbone@users.noreply.github.com> --- _typos.toml | 4 +++- crates/flow/src/incremental/analyzer.rs | 31 +++++++++++++------------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/_typos.toml b/_typos.toml index 45b430f..68cae16 100755 --- a/_typos.toml +++ b/_typos.toml @@ -30,13 +30,15 @@ extend-ignore-identifiers-re = [ "prev", "normalises", "goes", + "inout", + "Bare", ] [files] ignore-hidden = false ignore-files = true extend-exclude = [ - "./CHANGELOG.md", + "CHANGELOG.md", "/usr/**/*", "/tmp/**/*", "/**/node_modules/**", diff --git a/crates/flow/src/incremental/analyzer.rs b/crates/flow/src/incremental/analyzer.rs index 9b33262..9197104 100644 --- a/crates/flow/src/incremental/analyzer.rs +++ b/crates/flow/src/incremental/analyzer.rs @@ -471,21 +471,22 @@ impl IncrementalAnalyzer { } // Save edges to storage in batch - if !edges_to_save.is_empty() - && let Err(e) = self.storage.save_edges_batch(&edges_to_save).await - { - warn!( - error = %e, - "batch save failed, falling back to individual saves" - ); - for edge in &edges_to_save { - if let Err(e) = self.storage.save_edge(edge).await { - warn!( - file_from = ?edge.from, - file_to = ?edge.to, - error = %e, - "failed to save edge individually" - ); + #[allow(clippy::collapsible_if)] + if !edges_to_save.is_empty() { + if let Err(e) = self.storage.save_edges_batch(&edges_to_save).await { + warn!( + error = %e, + "batch save failed, falling back to individual saves" + ); + for edge in &edges_to_save { + if let Err(e) = self.storage.save_edge(edge).await { + warn!( + file_from = ?edge.from, + file_to = ?edge.to, + error = %e, + "failed to save edge individually" + ); + } } } } From 3620f000138ff688b270a6a3860d4ba1846c97ea Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 22:56:06 +0000 Subject: [PATCH 4/4] fix: resolve unstable trait compilation and reuse compliance CI issues Co-authored-by: bashandbone <89049923+bashandbone@users.noreply.github.com> --- crates/ast-engine/CHANGELOG.md | 6 ++++++ crates/flow/CHANGELOG.md | 6 ++++++ crates/language/CHANGELOG.md | 6 ++++++ crates/rule-engine/CHANGELOG.md | 6 ++++++ crates/services/CHANGELOG.md | 6 ++++++ crates/services/src/lib.rs | 1 - crates/services/src/types.rs | 5 ++++- crates/thread/CHANGELOG.md | 6 ++++++ crates/utils/CHANGELOG.md | 6 ++++++ 9 files changed, 46 insertions(+), 2 deletions(-) diff --git a/crates/ast-engine/CHANGELOG.md b/crates/ast-engine/CHANGELOG.md index e148820..50ef482 100644 --- a/crates/ast-engine/CHANGELOG.md +++ b/crates/ast-engine/CHANGELOG.md @@ -1,3 +1,9 @@ + + # Changelog All notable changes to this project will be documented in this file. diff --git a/crates/flow/CHANGELOG.md b/crates/flow/CHANGELOG.md index 5ed2c93..e1dcd0c 100644 --- a/crates/flow/CHANGELOG.md +++ b/crates/flow/CHANGELOG.md @@ -1,3 +1,9 @@ + + # Changelog All notable changes to this project will be documented in this file. diff --git a/crates/language/CHANGELOG.md b/crates/language/CHANGELOG.md index 4407155..9274d61 100644 --- a/crates/language/CHANGELOG.md +++ b/crates/language/CHANGELOG.md @@ -1,3 +1,9 @@ + + # Changelog All notable changes to this project will be documented in this file. diff --git a/crates/rule-engine/CHANGELOG.md b/crates/rule-engine/CHANGELOG.md index d136a0c..854434e 100644 --- a/crates/rule-engine/CHANGELOG.md +++ b/crates/rule-engine/CHANGELOG.md @@ -1,3 +1,9 @@ + + # Changelog All notable changes to this project will be documented in this file. diff --git a/crates/services/CHANGELOG.md b/crates/services/CHANGELOG.md index a6f374c..8d1b914 100644 --- a/crates/services/CHANGELOG.md +++ b/crates/services/CHANGELOG.md @@ -1,3 +1,9 @@ + + # Changelog All notable changes to this project will be documented in this file. diff --git a/crates/services/src/lib.rs b/crates/services/src/lib.rs index 06a9548..1da79fd 100644 --- a/crates/services/src/lib.rs +++ b/crates/services/src/lib.rs @@ -1,7 +1,6 @@ // SPDX-FileCopyrightText: 2025 Knitli Inc. // SPDX-FileContributor: Adam Poulemanos // SPDX-License-Identifier: AGPL-3.0-or-later -#![feature(trait_alias)] //! # Thread Service Layer //! //! This crate provides the service layer interfaces for Thread that abstract over diff --git a/crates/services/src/types.rs b/crates/services/src/types.rs index b8857c3..20ab2d2 100644 --- a/crates/services/src/types.rs +++ b/crates/services/src/types.rs @@ -52,7 +52,10 @@ pub use thread_ast_engine::{ pub use thread_language::{SupportLang, SupportLangErr}; #[cfg(not(feature = "ast-grep-backend"))] -pub trait Doc = Clone + 'static; +pub trait Doc: Clone + 'static {} + +#[cfg(not(feature = "ast-grep-backend"))] +impl Doc for T {} #[cfg(not(feature = "ast-grep-backend"))] #[derive(Debug, Clone)] diff --git a/crates/thread/CHANGELOG.md b/crates/thread/CHANGELOG.md index ea38aa7..9dba45e 100644 --- a/crates/thread/CHANGELOG.md +++ b/crates/thread/CHANGELOG.md @@ -1,3 +1,9 @@ + + # Changelog All notable changes to this project will be documented in this file. diff --git a/crates/utils/CHANGELOG.md b/crates/utils/CHANGELOG.md index 6ff800d..8a384fd 100644 --- a/crates/utils/CHANGELOG.md +++ b/crates/utils/CHANGELOG.md @@ -1,3 +1,9 @@ + + # Changelog All notable changes to this project will be documented in this file.