From 780dde0377f908e134cae3727e27c671e52154a3 Mon Sep 17 00:00:00 2001 From: LongYinan Date: Fri, 3 Oct 2025 13:32:25 +0800 Subject: [PATCH] style: fix clippy needless-pass-by-ref-mut --- crates/fspy/src/unix/mod.rs | 6 ++-- .../src/interceptions/spawn/exec/mod.rs | 2 +- .../src/interceptions/spawn/posix_spawn.rs | 2 +- .../src/supervisor/mod.rs | 2 +- .../fspy_seccomp_unotify/tests/arg_types.rs | 2 +- .../fspy_shared_unix/src/spawn/linux/mod.rs | 2 +- crates/fspy_shared_unix/src/spawn/macos.rs | 2 +- crates/vite_task/src/cache.rs | 2 +- crates/vite_task/src/doc.rs | 2 +- crates/vite_task/src/fmt.rs | 2 +- crates/vite_task/src/install.rs | 4 +-- crates/vite_task/src/lib.rs | 32 +++++++++---------- crates/vite_task/src/lib_cmd.rs | 2 +- crates/vite_task/src/lint.rs | 2 +- crates/vite_task/src/schedule.rs | 8 ++--- crates/vite_task/src/test.rs | 2 +- crates/vite_task/src/vite.rs | 2 +- crates/vite_tui/src/app.rs | 2 +- 18 files changed, 39 insertions(+), 39 deletions(-) diff --git a/crates/fspy/src/unix/mod.rs b/crates/fspy/src/unix/mod.rs index 9a079cda25..48cb6a8943 100644 --- a/crates/fspy/src/unix/mod.rs +++ b/crates/fspy/src/unix/mod.rs @@ -175,7 +175,7 @@ pub(crate) async fn spawn_impl(mut command: Command) -> io::Result let supervisor = supervise::()?; #[cfg(target_os = "linux")] - let mut supervisor_pre_exec = supervisor.pre_exec; + let supervisor_pre_exec = supervisor.pre_exec; let payload = Payload { ipc_fd: shm_fd_sender.as_raw_fd(), @@ -201,7 +201,7 @@ pub(crate) async fn spawn_impl(mut command: Command) -> io::Result let mut exec = command.get_exec(); let mut exec_resolve_accesses = PathAccessArena::default(); - let mut pre_exec = handle_exec( + let pre_exec = handle_exec( &mut exec, ExecResolveConfig::search_path_enabled(None), &encoded_payload, @@ -221,7 +221,7 @@ pub(crate) async fn spawn_impl(mut command: Command) -> io::Result #[cfg(target_os = "linux")] supervisor_pre_exec.run()?; - if let Some(pre_exec) = &mut pre_exec { + if let Some(pre_exec) = pre_exec.as_ref() { pre_exec.run()?; } Ok(()) diff --git a/crates/fspy_preload_unix/src/interceptions/spawn/exec/mod.rs b/crates/fspy_preload_unix/src/interceptions/spawn/exec/mod.rs index fbccfbd406..5d96875e19 100644 --- a/crates/fspy_preload_unix/src/interceptions/spawn/exec/mod.rs +++ b/crates/fspy_preload_unix/src/interceptions/spawn/exec/mod.rs @@ -35,7 +35,7 @@ fn handle_exec( global_client().expect("exec unexpectedly called before client initialized in ctor"); let result = unsafe { client.handle_exec(config, RawExec { prog, argv, envp }, |raw_command, pre_exec| { - if let Some(mut pre_exec) = pre_exec { + if let Some(pre_exec) = pre_exec { pre_exec.run()? }; Ok(execve::original()(raw_command.prog, raw_command.argv, raw_command.envp)) diff --git a/crates/fspy_preload_unix/src/interceptions/spawn/posix_spawn.rs b/crates/fspy_preload_unix/src/interceptions/spawn/posix_spawn.rs index 9feec393a3..b38738c76a 100644 --- a/crates/fspy_preload_unix/src/interceptions/spawn/posix_spawn.rs +++ b/crates/fspy_preload_unix/src/interceptions/spawn/posix_spawn.rs @@ -51,7 +51,7 @@ unsafe fn handle_posix_spawn( raw_command.envp.cast(), ) }; - if let Some(mut pre_exec) = pre_exec { + if let Some(pre_exec) = pre_exec { thread::scope(move |s| { let call_original = AssertSend(call_original); s.spawn(move || { diff --git a/crates/fspy_seccomp_unotify/src/supervisor/mod.rs b/crates/fspy_seccomp_unotify/src/supervisor/mod.rs index 81933931bd..16c15836de 100644 --- a/crates/fspy_seccomp_unotify/src/supervisor/mod.rs +++ b/crates/fspy_seccomp_unotify/src/supervisor/mod.rs @@ -27,7 +27,7 @@ pub struct Supervisor { pub struct PreExec(OwnedFd); impl PreExec { - pub fn run(&mut self) -> nix::Result<()> { + pub fn run(&self) -> nix::Result<()> { let mut fd_flag = FdFlag::from_bits_retain(fcntl(&self.0, FcntlArg::F_GETFD)?); fd_flag.remove(FdFlag::FD_CLOEXEC); fcntl(&self.0, FcntlArg::F_SETFD(fd_flag))?; diff --git a/crates/fspy_seccomp_unotify/tests/arg_types.rs b/crates/fspy_seccomp_unotify/tests/arg_types.rs index d724f29436..c8f9f4055b 100644 --- a/crates/fspy_seccomp_unotify/tests/arg_types.rs +++ b/crates/fspy_seccomp_unotify/tests/arg_types.rs @@ -52,7 +52,7 @@ async fn run_in_pre_exec( ) -> Result, Box> { Ok(timeout(Duration::from_secs(5), async move { let mut cmd = Command::new("/bin/echo"); - let Supervisor { payload, handling_loop, mut pre_exec } = supervise::()?; + let Supervisor { payload, handling_loop, pre_exec } = supervise::()?; unsafe { cmd.pre_exec(move || { diff --git a/crates/fspy_shared_unix/src/spawn/linux/mod.rs b/crates/fspy_shared_unix/src/spawn/linux/mod.rs index d303d0cf62..f6ea8d16e9 100644 --- a/crates/fspy_shared_unix/src/spawn/linux/mod.rs +++ b/crates/fspy_shared_unix/src/spawn/linux/mod.rs @@ -15,7 +15,7 @@ const LD_PRELOAD: &str = "LD_PRELOAD"; pub struct PreExec(SeccompPayload); impl PreExec { - pub fn run(&mut self) -> nix::Result<()> { + pub fn run(&self) -> nix::Result<()> { install_target(&self.0) } } diff --git a/crates/fspy_shared_unix/src/spawn/macos.rs b/crates/fspy_shared_unix/src/spawn/macos.rs index 870cbd3620..f6b3bae3fa 100644 --- a/crates/fspy_shared_unix/src/spawn/macos.rs +++ b/crates/fspy_shared_unix/src/spawn/macos.rs @@ -15,7 +15,7 @@ use crate::{ pub struct PreExec(Infallible); impl PreExec { - pub fn run(&mut self) -> nix::Result<()> { + pub fn run(&self) -> nix::Result<()> { match self.0 {} } } diff --git a/crates/vite_task/src/cache.rs b/crates/vite_task/src/cache.rs index e74123c714..224565a751 100644 --- a/crates/vite_task/src/cache.rs +++ b/crates/vite_task/src/cache.rs @@ -127,7 +127,7 @@ impl TaskCache { } pub async fn update( - &mut self, + &self, resolved_task: &ResolvedTask, cached_task: CommandCacheValue, ) -> Result<(), Error> { diff --git a/crates/vite_task/src/doc.rs b/crates/vite_task/src/doc.rs index 0d15574896..d1f9d373dc 100644 --- a/crates/vite_task/src/doc.rs +++ b/crates/vite_task/src/doc.rs @@ -10,7 +10,7 @@ use crate::{ pub async fn doc>, DocFn: Fn() -> Doc>( resolve_doc_command: DocFn, - workspace: &mut Workspace, + workspace: &Workspace, args: &Vec, ) -> Result { let resolved_task = diff --git a/crates/vite_task/src/fmt.rs b/crates/vite_task/src/fmt.rs index f98420dbb0..719ad6adbf 100644 --- a/crates/vite_task/src/fmt.rs +++ b/crates/vite_task/src/fmt.rs @@ -18,7 +18,7 @@ pub struct FmtConfig { #[tracing::instrument(skip(resolve_fmt_command, workspace))] pub async fn fmt>, FmtFn: Fn() -> Fmt>( resolve_fmt_command: FmtFn, - workspace: &mut Workspace, + workspace: &Workspace, args: &Vec, ) -> Result { let resolved_task = diff --git a/crates/vite_task/src/install.rs b/crates/vite_task/src/install.rs index ccb1cb8965..03d6ca25e6 100644 --- a/crates/vite_task/src/install.rs +++ b/crates/vite_task/src/install.rs @@ -58,7 +58,7 @@ impl InstallCommand { } Err(e) => return Err(e), }; - let mut workspace = Workspace::partial_load(self.workspace_root)?; + let workspace = Workspace::partial_load(self.workspace_root)?; let resolve_command = package_manager.resolve_command(); let resolved_task = ResolvedTask::resolve_from_builtin_with_command_result( &workspace, @@ -69,7 +69,7 @@ impl InstallCommand { )?; let mut task_graph: StableGraph = Default::default(); task_graph.add_node(resolved_task); - let summary = ExecutionPlan::plan(task_graph, false)?.execute(&mut workspace).await?; + let summary = ExecutionPlan::plan(task_graph, false)?.execute(&workspace).await?; workspace.unload().await?; Ok(summary) diff --git a/crates/vite_task/src/lib.rs b/crates/vite_task/src/lib.rs index 5d995c84d2..73aab0c763 100644 --- a/crates/vite_task/src/lib.rs +++ b/crates/vite_task/src/lib.rs @@ -315,7 +315,7 @@ pub async fn main< } else { recursive_run }; - let mut workspace = Workspace::load(cwd, topological_run)?; + let workspace = Workspace::load(cwd, topological_run)?; let task_graph = workspace.build_task_subgraph( tasks, @@ -324,12 +324,12 @@ pub async fn main< )?; let plan = ExecutionPlan::plan(task_graph, parallel_run)?; - let summary = plan.execute(&mut workspace).await?; + let summary = plan.execute(&workspace).await?; workspace.unload().await?; summary } Commands::Lint { args } => { - let mut workspace = Workspace::partial_load(cwd)?; + let workspace = Workspace::partial_load(cwd)?; let lint_fn = options .as_ref() .map(|o| &o.lint) @@ -356,41 +356,41 @@ pub async fn main< oxlint_config_path.as_path().to_string_lossy().into_owned(), ]); } - let summary = lint::lint(lint_fn, &mut workspace, args).await?; + let summary = lint::lint(lint_fn, &workspace, args).await?; workspace.unload().await?; summary } Commands::Fmt { args } => { - let mut workspace = Workspace::partial_load(cwd)?; + let workspace = Workspace::partial_load(cwd)?; let fmt_fn = options.map(|o| o.fmt).expect("fmt command requires CliOptions to be provided"); - let summary = fmt::fmt(fmt_fn, &mut workspace, args).await?; + let summary = fmt::fmt(fmt_fn, &workspace, args).await?; workspace.unload().await?; summary } Commands::Build { args } => { - let mut workspace = Workspace::partial_load(cwd)?; + let workspace = Workspace::partial_load(cwd)?; let vite_fn = options.map(|o| o.vite).expect("build command requires CliOptions to be provided"); - let summary = vite::create_vite("build", vite_fn, &mut workspace, args).await?; + let summary = vite::create_vite("build", vite_fn, &workspace, args).await?; workspace.unload().await?; summary } Commands::Test { args } => { - let mut workspace = Workspace::partial_load(cwd)?; + let workspace = Workspace::partial_load(cwd)?; let test_fn = options.map(|o| o.test).expect("test command requires CliOptions to be provided"); - let summary = test::test(test_fn, &mut workspace, args).await?; + let summary = test::test(test_fn, &workspace, args).await?; workspace.unload().await?; summary } Commands::Lib { args } => { - let mut workspace = Workspace::partial_load(cwd)?; + let workspace = Workspace::partial_load(cwd)?; let lib_fn = options.map(|o| o.lib).expect("lib command requires CliOptions to be provided"); - let summary = lib_cmd::lib(lib_fn, &mut workspace, args).await?; + let summary = lib_cmd::lib(lib_fn, &workspace, args).await?; workspace.unload().await?; summary } @@ -398,16 +398,16 @@ pub async fn main< install::InstallCommand::builder(cwd).build().execute(args).await? } Commands::Dev { args } => { - let mut workspace = Workspace::partial_load(cwd)?; + let workspace = Workspace::partial_load(cwd)?; let vite_fn = options.map(|o| o.vite).expect("dev command requires CliOptions"); - let summary = vite::create_vite("dev", vite_fn, &mut workspace, args).await?; + let summary = vite::create_vite("dev", vite_fn, &workspace, args).await?; workspace.unload().await?; summary } Commands::Doc { args } => { - let mut workspace = Workspace::partial_load(cwd)?; + let workspace = Workspace::partial_load(cwd)?; let doc_fn = options.map(|o| o.doc).expect("doc command requires CliOptions"); - let summary = doc::doc(doc_fn, &mut workspace, args).await?; + let summary = doc::doc(doc_fn, &workspace, args).await?; workspace.unload().await?; summary } diff --git a/crates/vite_task/src/lib_cmd.rs b/crates/vite_task/src/lib_cmd.rs index eded9e8836..df8e58d291 100644 --- a/crates/vite_task/src/lib_cmd.rs +++ b/crates/vite_task/src/lib_cmd.rs @@ -11,7 +11,7 @@ use crate::{ #[tracing::instrument(skip(resolve_lib_command, workspace))] pub async fn lib>, LibFn: Fn() -> Lib>( resolve_lib_command: LibFn, - workspace: &mut Workspace, + workspace: &Workspace, args: &Vec, ) -> Result { let resolved_task = diff --git a/crates/vite_task/src/lint.rs b/crates/vite_task/src/lint.rs index 11c1d4e7d3..6f3e35b9c0 100644 --- a/crates/vite_task/src/lint.rs +++ b/crates/vite_task/src/lint.rs @@ -20,7 +20,7 @@ pub async fn lint< LintFn: Fn() -> Lint, >( resolve_lint_command: LintFn, - workspace: &mut Workspace, + workspace: &Workspace, args: &Vec, ) -> Result { let resolved_task = diff --git a/crates/vite_task/src/schedule.rs b/crates/vite_task/src/schedule.rs index 11ef8c00fa..211902aa05 100644 --- a/crates/vite_task/src/schedule.rs +++ b/crates/vite_task/src/schedule.rs @@ -125,7 +125,7 @@ impl ExecutionPlan { /// - `Ok(ExecutionSummary)` containing execution status of all tasks (some may fail with non-zero exit code) /// - `Err(_)` for other errors (network, filesystem, etc.) #[tracing::instrument(skip(self, workspace))] - pub async fn execute(self, workspace: &mut Workspace) -> Result { + pub async fn execute(self, workspace: &Workspace) -> Result { let mut execution_statuses = Vec::::with_capacity(self.steps.len()); for step in self.steps { execution_statuses.push(Self::execute_resolved_task(step, workspace).await?); @@ -135,7 +135,7 @@ impl ExecutionPlan { async fn execute_resolved_task( step: ResolvedTask, - workspace: &mut Workspace, + workspace: &Workspace, ) -> anyhow::Result { tracing::debug!("Executing task {}", step.display_name()); let display_options = step.display_options; @@ -146,7 +146,7 @@ impl ExecutionPlan { let (cache_status, execute_or_replay) = get_cached_or_execute( &execution_id, step.clone(), - &mut workspace.task_cache, + &workspace.task_cache, &workspace.fs, &workspace.workspace_dir, ) @@ -183,7 +183,7 @@ impl ExecutionPlan { async fn get_cached_or_execute<'a>( execution_id: &'a str, task: ResolvedTask, - cache: &'a mut TaskCache, + cache: &'a TaskCache, fs: &'a impl FileSystem, base_dir: &'a AbsolutePath, ) -> Result<(CacheStatus, BoxFuture<'a, Result>), Error> { diff --git a/crates/vite_task/src/test.rs b/crates/vite_task/src/test.rs index 0d3a7a39ef..0f35897bfa 100644 --- a/crates/vite_task/src/test.rs +++ b/crates/vite_task/src/test.rs @@ -13,7 +13,7 @@ pub async fn test< TestFn: Fn() -> Test, >( resolve_test_command: TestFn, - workspace: &mut Workspace, + workspace: &Workspace, args: &Vec, ) -> Result { let resolved_task = ResolvedTask::resolve_from_builtin( diff --git a/crates/vite_task/src/vite.rs b/crates/vite_task/src/vite.rs index 0adf99f3e5..b09dfbee16 100644 --- a/crates/vite_task/src/vite.rs +++ b/crates/vite_task/src/vite.rs @@ -14,7 +14,7 @@ pub async fn create_vite< >( arg_forward: &str, resolve_vite_command: ViteFn, - workspace: &mut Workspace, + workspace: &Workspace, args: &Vec, ) -> Result { let resolved_task = ResolvedTask::resolve_from_builtin( diff --git a/crates/vite_tui/src/app.rs b/crates/vite_tui/src/app.rs index d4bd86f811..f7b9c705cd 100644 --- a/crates/vite_tui/src/app.rs +++ b/crates/vite_tui/src/app.rs @@ -135,7 +135,7 @@ impl App { Ok(()) } - async fn handle_events(&mut self, tui: &mut Tui) -> Result<()> { + async fn handle_events(&self, tui: &mut Tui) -> Result<()> { let Some(event) = tui.next_event().await else { return Ok(()); };