From af1c013562aae3d17b69f25b334e901ab460737f Mon Sep 17 00:00:00 2001 From: Alex Janka Date: Thu, 26 Sep 2024 10:42:24 +1000 Subject: [PATCH] rustfmt.toml --- rust-toolchain.toml | 2 ++ rustfmt.toml | 5 +++++ src/colour.rs | 3 +-- src/config.rs | 3 +-- src/logger.rs | 3 +-- src/main.rs | 3 +-- 6 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 rust-toolchain.toml create mode 100644 rustfmt.toml diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..5d56faf --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "nightly" diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..037d953 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,5 @@ +wrap_comments = true +imports_granularity = "Crate" +group_imports = "One" +newline_style = "Unix" +use_field_init_shorthand = true diff --git a/src/colour.rs b/src/colour.rs index 94cad92..30d7bee 100644 --- a/src/colour.rs +++ b/src/colour.rs @@ -1,6 +1,5 @@ -use palette::FromColor; - use crate::prelude::*; +use palette::FromColor; pub type Format = palette::Oklab; pub type RgbFormat = palette::Srgb; diff --git a/src/config.rs b/src/config.rs index 322eb93..2828443 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,6 +1,5 @@ -use serde::{Deserialize, Serialize}; - use crate::prelude::*; +use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] #[serde(default)] diff --git a/src/logger.rs b/src/logger.rs index ca1802c..c701714 100644 --- a/src/logger.rs +++ b/src/logger.rs @@ -1,3 +1,4 @@ +use crate::prelude::*; use log::LevelFilter; use log4rs::{ append::{ @@ -12,8 +13,6 @@ use log4rs::{ Config, }; -use crate::prelude::*; - pub async fn init_logger(file: bool) -> Res<()> { let stderr = ConsoleAppender::builder() .target(Target::Stderr) diff --git a/src/main.rs b/src/main.rs index c4df825..0200c16 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,8 +8,7 @@ mod logger; pub mod prelude { pub(crate) use crate::colour; - pub use crate::error::*; - pub use crate::CONFIG; + pub use crate::{error::*, CONFIG}; } use prelude::*;