From 8d11eb64efa67f1d7a6902300fdffd2c7c08df6c Mon Sep 17 00:00:00 2001 From: Ruben Beltran del Rio Date: Fri, 18 Jul 2025 13:22:04 +0200 Subject: Apply clippy and formatting --- src/command/status/blog_status.rs | 6 +++--- src/command/status/configuration_status.rs | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/command/status') diff --git a/src/command/status/blog_status.rs b/src/command/status/blog_status.rs index 32881d0..cae101a 100644 --- a/src/command/status/blog_status.rs +++ b/src/command/status/blog_status.rs @@ -1,7 +1,7 @@ use crate::configuration::Configuration; use std::fmt::Write; use std::fs::read_dir; -use std::io::{Error, ErrorKind, Result}; +use std::io::{Error, Result}; use std::path::PathBuf; pub fn status(configuration: &Configuration) -> Result { @@ -12,14 +12,14 @@ pub fn status(configuration: &Configuration) -> Result { // Main Configuration Locations let blog_count = count_entries(&configuration.posts_directory); writeln!(&mut status_message, "Number of posts in blog: {blog_count}") - .map_err(|_| Error::new(ErrorKind::Other, "Unable to write status"))?; + .map_err(|_| Error::other("Unable to write status"))?; let archive_count = count_entries(&configuration.archive_directory); writeln!( &mut status_message, "Number of posts in archive: {archive_count}" ) - .map_err(|_| Error::new(ErrorKind::Other, "Unable to write status"))?; + .map_err(|_| Error::other("Unable to write status"))?; Ok(status_message) } diff --git a/src/command/status/configuration_status.rs b/src/command/status/configuration_status.rs index 6f7db14..4a01768 100644 --- a/src/command/status/configuration_status.rs +++ b/src/command/status/configuration_status.rs @@ -1,7 +1,7 @@ use crate::configuration::Configuration; use std::fmt::Write; use std::fs; -use std::io::{Error, ErrorKind, Result}; +use std::io::{Error, Result}; use std::path::PathBuf; pub fn status(configuration: &Configuration) -> Result { @@ -27,7 +27,7 @@ pub fn status(configuration: &Configuration) -> Result { "Number of posts to keep: {}", configuration.max_posts ) - .map_err(|_| Error::new(ErrorKind::Other, "Unable to write status"))?; + .map_err(|_| Error::other("Unable to write status"))?; Ok(status_message) } @@ -35,7 +35,7 @@ fn get_directory_stats(label: &str, directory: &PathBuf) -> Result { let mut status_message = String::new(); write!(&mut status_message, "{}: {}. ", label, directory.display()) - .map_err(|_| Error::new(ErrorKind::Other, "Unable to write status"))?; + .map_err(|_| Error::other("Unable to write status"))?; if directory.exists() { status_message.push_str("Exists "); if fs::read_dir(directory).is_ok() { @@ -52,7 +52,7 @@ fn get_directory_stats(label: &str, directory: &PathBuf) -> Result { #[cfg(test)] mod tests { - use std::fs::{Permissions, create_dir_all, metadata, set_permissions}; + use std::fs::{metadata, set_permissions}; use std::path::PathBuf; #[cfg(unix)] @@ -61,7 +61,7 @@ mod tests { #[cfg(windows)] use std::os::windows::fs::PermissionsExt; - use crate::configuration::Configuration; + use test_utilities::*; -- cgit