lint

Author: sandydoo

devenv-cache-core/src/lib.rs

@@ -18,4 +18,4 @@ pub mod time;
 // Re-export common types for convenience
 pub use db::Database;
 pub use error::{CacheError, CacheResult};
-pub use file::{compute_file_hash, compute_string_hash, TrackedFile};
+pub use file::{TrackedFile, compute_file_hash, compute_string_hash};

devenv-eval-cache/src/bin/main.rs

@@ -12,9 +12,7 @@ async fn main() -> Result<(), command::CommandError> {
     // Connect to database and run migrations
     let db = devenv_cache_core::db::Database::new(path, &db::MIGRATIONS)
         .await
-        .map_err(|e| {
-            command::CommandError::Io(std::io::Error::other(e))
-        })?;
+        .map_err(|e| command::CommandError::Io(std::io::Error::other(e)))?;
     let pool = db.pool().clone();
 
     let mut cmd = Command::new("nix");

devenv-eval-cache/src/command.rs

@@ -339,11 +339,7 @@ impl FileInputDesc {
             Some(compute_string_hash(&paths))
         } else {
             compute_file_hash(&path)
-                .map_err(|e| {
-                    std::io::Error::other(
-                        format!("Failed to compute file hash: {e}"),
-                    )
-                })
+                .map_err(|e| std::io::Error::other(format!("Failed to compute file hash: {e}")))
                 .ok()
         };
         let modified_at = truncate_to_seconds(
@@ -645,11 +641,8 @@ fn check_file_state(file: &FileInputDesc) -> io::Result<FileState> {
             .collect::<String>();
         compute_string_hash(&paths)
     } else {
-        compute_file_hash(&file.path).map_err(|e| {
-            std::io::Error::other(
-                format!("Failed to compute file hash: {e}"),
-            )
-        })?
+        compute_file_hash(&file.path)
+            .map_err(|e| std::io::Error::other(format!("Failed to compute file hash: {e}")))?
     };
 
     if Some(&new_hash) == file.content_hash.as_ref() {
@@ -711,11 +704,7 @@ mod test {
         let modified_at = metadata.modified().unwrap();
         let truncated_modified_at = truncate_to_seconds(modified_at).unwrap();
         let content_hash = compute_file_hash(&file_path)
-            .map_err(|e| {
-                std::io::Error::other(
-                    format!("Failed to compute file hash: {e}"),
-                )
-            })
+            .map_err(|e| std::io::Error::other(format!("Failed to compute file hash: {e}")))
             .unwrap();
 
         db::FileInputRow {

devenv-generate/src/main.rs

@@ -1,9 +1,9 @@
-use clap::{crate_version, Parser};
+use clap::{Parser, crate_version};
 use devenv::{
     default_system,
     log::{self, LogFormat},
 };
-use miette::{bail, IntoDiagnostic, Result};
+use miette::{IntoDiagnostic, Result, bail};
 use similar::{ChangeTag, TextDiff};
 use std::path::{Path, PathBuf};
 use tracing::{info, warn};

devenv-run-tests/src/main.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use devenv::{log, Devenv, DevenvOptions};
+use devenv::{Devenv, DevenvOptions, log};
 use miette::{IntoDiagnostic, Result, WrapErr};
 use serde::{Deserialize, Serialize};
 use std::{

devenv-tasks/src/error.rs

@@ -32,10 +32,9 @@ impl Display for Error {
             ),
             Error::TaskNotFound(task) => write!(f, "Task does not exist: {task}"),
             Error::CycleDetected(task) => write!(f, "Cycle detected at task: {task}"),
-            Error::MissingCommand(task) => write!(
-                f,
-                "Task {task} defined a status, but is missing a command"
-            ),
+            Error::MissingCommand(task) => {
+                write!(f, "Task {task} defined a status, but is missing a command")
+            }
             Error::InvalidTaskName(task) => write!(
                 f,
                 "Invalid task name: {task}, expected [a-zA-Z-_]+:[a-zA-Z-_]+"

devenv-tasks/src/main.rs

@@ -1,6 +1,6 @@
 use clap::{Parser, Subcommand};
 use devenv_tasks::{
-    signal_handler::SignalHandler, Config, RunMode, TaskConfig, TasksUi, VerbosityLevel,
+    Config, RunMode, TaskConfig, TasksUi, VerbosityLevel, signal_handler::SignalHandler,
 };
 use std::env;
 

devenv-tasks/src/signal_handler.rs

@@ -1,8 +1,8 @@
 use nix::sys::signal::{self, SaFlags, SigAction, SigHandler, SigSet, Signal};
 use nix::unistd;
-use std::sync::atomic::{AtomicI32, Ordering};
 use std::sync::Arc;
-use tokio::signal::unix::{signal, SignalKind};
+use std::sync::atomic::{AtomicI32, Ordering};
+use tokio::signal::unix::{SignalKind, signal};
 use tokio_util::sync::CancellationToken;
 use tracing::debug;