fix: resolve lint issues at ast-grep/native.rs

amirabbas-gh · amirabbas-gh · commit 5e172b01f931 · 2025-07-18T15:40:29.000+03:30
diff --git a/crates/codemod-sandbox/src/ast_grep/native.rs b/crates/codemod-sandbox/src/ast_grep/native.rs
@@ -1,9 +1,8 @@
 use std::fs;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
-use std::sync::Arc;
 
-use crate::sandbox::engine::language_data::get_extensions_for_language;
+use crate::sandbox::engine::{language_data::get_extensions_for_language, ProgressCallback};
 use crate::tree_sitter::{load_tree_sitter, SupportedLanguage};
 use ast_grep_codemod_dynamic_lang::DynamicLang;
 use ast_grep_config::{from_yaml_string, CombinedScan, RuleConfig};
@@ -65,7 +64,7 @@ pub async fn execute_ast_grep_on_globs(
     base_path: Option<&str>,
     config_file: &str,
     working_dir: Option<&Path>,
-    progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+    progress_callback: Option<ProgressCallback>,
 ) -> Result<Vec<AstGrepMatch>, AstGrepError> {
     execute_ast_grep_on_globs_with_options(
         include_globs,
@@ -86,7 +85,7 @@ pub async fn execute_ast_grep_on_globs_with_fixes(
     base_path: Option<&str>,
     config_file: &str,
     working_dir: Option<&Path>,
-    progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+    progress_callback: Option<ProgressCallback>,
 ) -> Result<Vec<AstGrepMatch>, AstGrepError> {
     execute_ast_grep_on_globs_with_options(
         include_globs,
@@ -112,7 +111,7 @@ async fn execute_ast_grep_on_globs_with_options(
     config_file: &str,
     working_dir: Option<&Path>,
     apply_fixes: bool,
-    progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+    progress_callback: Option<ProgressCallback>,
 ) -> Result<Vec<AstGrepMatch>, AstGrepError> {
     // Resolve config file path
     let config_path = if let Some(wd) = working_dir {
@@ -530,7 +529,7 @@ pub async fn execute_ast_grep_on_paths(
     paths: &[String],
     config_file: &str,
     working_dir: Option<&Path>,
-    progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+    progress_callback: Option<ProgressCallback>,
 ) -> Result<Vec<AstGrepMatch>, AstGrepError> {
     execute_ast_grep_on_globs(
         Some(paths),
@@ -548,7 +547,7 @@ pub async fn execute_ast_grep_on_paths_with_fixes(
     paths: &[String],
     config_file: &str,
     working_dir: Option<&Path>,
-    progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+    progress_callback: Option<ProgressCallback>,
 ) -> Result<Vec<AstGrepMatch>, AstGrepError> {
     execute_ast_grep_on_globs_with_fixes(
         Some(paths),
diff --git a/crates/core/src/engine.rs b/crates/core/src/engine.rs
@@ -643,7 +643,7 @@ impl Engine {
     async fn execute_workflow(
         &self,
         workflow_run_id: Uuid,
-        progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+        progress_callback: Option<ProgressCallback>,
     ) -> Result<()> {
         // Get the workflow run
         let workflow_run = self
@@ -939,7 +939,7 @@ impl Engine {
     async fn execute_task(
         &self,
         task_id: Uuid,
-        progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+        progress_callback: Option<ProgressCallback>,
     ) -> Result<()> {
         let task = self.state_adapter.lock().await.get_task(task_id).await?;
 
@@ -1157,7 +1157,7 @@ impl Engine {
         state: &HashMap<String, serde_json::Value>,
         workflow: &Workflow,
         bundle_path: &Option<PathBuf>,
-        progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+        progress_callback: Option<ProgressCallback>,
     ) -> Result<()> {
         self.execute_step_action_with_chain(
             runner,
@@ -1189,7 +1189,7 @@ impl Engine {
         workflow: &Workflow,
         bundle_path: &Option<PathBuf>,
         dependency_chain: &[CodemodDependency],
-        progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+        progress_callback: Option<ProgressCallback>,
     ) -> Result<()> {
         match action {
             StepAction::RunScript(run) => {
@@ -1274,7 +1274,7 @@ impl Engine {
         &self,
         ast_grep: &UseAstGrep,
         bundle_path: Option<&std::path::Path>,
-        progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+        progress_callback: Option<ProgressCallback>,
     ) -> Result<()> {
         // Use bundle path as working directory, falling back to current directory
         let working_dir = bundle_path
@@ -1366,7 +1366,7 @@ impl Engine {
         &self,
         js_ast_grep: &UseJSAstGrep,
         bundle_path: Option<&std::path::Path>,
-        progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+        progress_callback: Option<ProgressCallback>,
     ) -> Result<()> {
         // Use bundle path as working directory, falling back to current directory
         let working_dir = bundle_path
@@ -1502,7 +1502,7 @@ impl Engine {
         state: &HashMap<String, serde_json::Value>,
         bundle_path: &Option<PathBuf>,
         dependency_chain: &[CodemodDependency],
-        progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+        progress_callback: Option<ProgressCallback>,
     ) -> Result<()> {
         info!("Executing codemod step: {}", codemod.source);
 
@@ -1594,7 +1594,7 @@ impl Engine {
         state: &HashMap<String, serde_json::Value>,
         bundle_path: &Option<PathBuf>,
         dependency_chain: &[CodemodDependency],
-        progress_callback: Option<Arc<Box<dyn Fn(u64, u64) + Send + Sync>>>,
+        progress_callback: Option<ProgressCallback>,
     ) -> Result<()> {
         let workflow_path = resolved_package.package_dir.join("workflow.yaml");
 
