style: fix clippy warnings

- Collapse if statements with if-let chains
- Use &Path instead of &PathBuf in function parameters

Author: aster-void

src/actor/job/executor.rs

@@ -2,7 +2,7 @@ use rand::Rng;
 use std::collections::HashMap;
 use std::fs::{self, File, OpenOptions};
 use std::io::Write;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::time::Duration;
 use tokio::process::Command;
 use tokio::time::sleep;
@@ -16,7 +16,7 @@ use crate::webhook::{self, JobFailure};
 /// Default jitter ratio when not explicitly configured (25% of base delay)
 const AUTO_JITTER_RATIO: u32 = 25;
 
-pub async fn execute_job(job: &Job, sot_path: &PathBuf, runner: &RunnerConfig) -> bool {
+pub async fn execute_job(job: &Job, sot_path: &Path, runner: &RunnerConfig) -> bool {
     let job_dir = git::get_job_dir(sot_path, &job.id);
     let work_dir = resolve_work_dir(sot_path, &job.id, &job.working_dir);
     let mut log_file = job
@@ -28,8 +28,8 @@ pub async fn execute_job(job: &Job, sot_path: &PathBuf, runner: &RunnerConfig) -
     let mut last_result: Option<CommandResult> = None;
 
     for attempt in 0..max_attempts {
-        if attempt > 0 {
-            if let Some(retry) = job.retry.as_ref() {
+        if attempt > 0
+            && let Some(retry) = job.retry.as_ref() {
                 let delay = calculate_backoff(retry, attempt - 1);
                 info!(
                     target: "rollcron::job",
@@ -41,7 +41,6 @@ pub async fn execute_job(job: &Job, sot_path: &PathBuf, runner: &RunnerConfig) -
                 );
                 sleep(delay).await;
             }
-        }
 
         info!(
             target: "rollcron::job",
@@ -116,7 +115,7 @@ pub async fn execute_job(job: &Job, sot_path: &PathBuf, runner: &RunnerConfig) -
     false
 }
 
-fn resolve_work_dir(sot_path: &PathBuf, job_id: &str, working_dir: &Option<String>) -> PathBuf {
+fn resolve_work_dir(sot_path: &Path, job_id: &str, working_dir: &Option<String>) -> PathBuf {
     let job_dir = git::get_job_dir(sot_path, job_id);
     match working_dir {
         Some(dir) => {
@@ -141,8 +140,8 @@ fn resolve_work_dir(sot_path: &PathBuf, job_id: &str, working_dir: &Option<Strin
 
 async fn run_command(
     job: &Job,
-    work_dir: &PathBuf,
-    sot_path: &PathBuf,
+    work_dir: &Path,
+    sot_path: &Path,
     runner: &RunnerConfig,
 ) -> CommandResult {
     let env_vars = match merge_env_vars(job, work_dir, sot_path, runner) {
@@ -180,7 +179,7 @@ async fn run_command(
 /// Load runner-level env vars for webhook URL expansion.
 /// Returns None on error (webhook will fall back to process env).
 fn load_runner_env_vars(
-    sot_path: &PathBuf,
+    sot_path: &Path,
     runner: &RunnerConfig,
 ) -> Option<HashMap<String, String>> {
     let mut env_vars = HashMap::new();
@@ -210,8 +209,8 @@ fn load_runner_env_vars(
 
 fn merge_env_vars(
     job: &Job,
-    work_dir: &PathBuf,
-    sot_path: &PathBuf,
+    work_dir: &Path,
+    sot_path: &Path,
     runner: &RunnerConfig,
 ) -> anyhow::Result<HashMap<String, String>> {
     let mut env_vars = HashMap::new();
@@ -319,26 +318,24 @@ fn generate_jitter(max: Duration) -> Duration {
 
 // === Logging ===
 
-fn rotate_log_file(path: &PathBuf, max_size: u64) {
-    if let Ok(meta) = fs::metadata(path) {
-        if meta.len() >= max_size {
+fn rotate_log_file(path: &Path, max_size: u64) {
+    if let Ok(meta) = fs::metadata(path)
+        && meta.len() >= max_size {
             let old_path = path.with_extension("log.old");
             let _ = fs::remove_file(&old_path);
             let _ = fs::rename(path, &old_path);
         }
-    }
 }
 
-fn create_log_file(job_dir: &PathBuf, log_path: &str, max_size: u64) -> Option<File> {
+fn create_log_file(job_dir: &Path, log_path: &str, max_size: u64) -> Option<File> {
     let expanded = env::expand_string(log_path);
     let full_path = job_dir.join(&expanded);
 
-    if let Some(parent) = full_path.parent() {
-        if let Err(e) = fs::create_dir_all(parent) {
+    if let Some(parent) = full_path.parent()
+        && let Err(e) = fs::create_dir_all(parent) {
             warn!(target: "rollcron::job", error = %e, "Failed to create log directory");
             return None;
         }
-    }
 
     rotate_log_file(&full_path, max_size);
 

src/actor/runner/git_poll.rs

@@ -2,7 +2,7 @@ use super::{ConfigUpdate, GetRunnerConfig};
 use crate::config::{self, RunnerConfig};
 use crate::{env, git, webhook};
 use std::collections::HashMap;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::time::Duration;
 use tokio::time::interval;
 use tracing::{error, info, warn};
@@ -55,7 +55,7 @@ where
     }
 }
 
-async fn notify_config_error<A>(addr: &Address<A, Weak>, sot_path: &PathBuf, error: &str)
+async fn notify_config_error<A>(addr: &Address<A, Weak>, sot_path: &Path, error: &str)
 where
     A: Handler<GetRunnerConfig, Return = RunnerConfig>,
 {
@@ -83,7 +83,7 @@ where
     }
 }
 
-fn load_runner_env(sot_path: &PathBuf, runner: &RunnerConfig) -> Option<HashMap<String, String>> {
+fn load_runner_env(sot_path: &Path, runner: &RunnerConfig) -> Option<HashMap<String, String>> {
     let mut env_vars = HashMap::new();
 
     if let Some(env_file_path) = &runner.env_file {
@@ -107,7 +107,7 @@ fn load_runner_env(sot_path: &PathBuf, runner: &RunnerConfig) -> Option<HashMap<
     Some(env_vars)
 }
 
-fn load_config(sot_path: &PathBuf) -> anyhow::Result<(config::RunnerConfig, Vec<config::Job>)> {
+fn load_config(sot_path: &Path) -> anyhow::Result<(config::RunnerConfig, Vec<config::Job>)> {
     let config_path = sot_path.join(CONFIG_FILE);
     let content = std::fs::read_to_string(&config_path)
         .map_err(|e| anyhow::anyhow!("Failed to read {}: {}", config_path.display(), e))?;

src/main.rs

@@ -8,7 +8,7 @@ mod webhook;
 use actor::runner::{GetJobIds, GracefulShutdown, Initialize, RunnerActor};
 use anyhow::{Context, Result};
 use clap::Parser;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::time::Duration;
 use tracing::{error, info};
 use xtra::prelude::*;
@@ -84,7 +84,7 @@ async fn main() -> Result<()> {
     Ok(())
 }
 
-fn load_config(sot_path: &PathBuf) -> Result<(config::RunnerConfig, Vec<config::Job>)> {
+fn load_config(sot_path: &Path) -> Result<(config::RunnerConfig, Vec<config::Job>)> {
     let config_path = sot_path.join(CONFIG_FILE);
     let content = std::fs::read_to_string(&config_path)
         .map_err(|e| anyhow::anyhow!("Failed to read {}: {}", config_path.display(), e))?;