From d8a3e8e93eed5e2251bfda52887386facd1c4a26 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Thu, 27 Mar 2025 19:24:11 +0000 Subject: [PATCH] Lint --- backend/sync_server/src/cli/args.rs | 4 ++-- backend/sync_server/src/cli/color_when.rs | 6 +++--- backend/sync_server/src/main.rs | 10 ++++------ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/backend/sync_server/src/cli/args.rs b/backend/sync_server/src/cli/args.rs index 9ffbd892..7c2976bc 100644 --- a/backend/sync_server/src/cli/args.rs +++ b/backend/sync_server/src/cli/args.rs @@ -1,6 +1,6 @@ -use std::{ffi::OsString, io::IsTerminal}; +use std::ffi::OsString; -use clap::{Parser, ValueEnum}; +use clap::Parser; use clap_verbosity_flag::{InfoLevel, Verbosity}; use crate::cli::color_when::ColorWhen; diff --git a/backend/sync_server/src/cli/color_when.rs b/backend/sync_server/src/cli/color_when.rs index b463d375..a3709b94 100644 --- a/backend/sync_server/src/cli/color_when.rs +++ b/backend/sync_server/src/cli/color_when.rs @@ -1,6 +1,6 @@ -use std::{ffi::OsString, io::IsTerminal}; +use std::io::IsTerminal; -use clap::{Parser, ValueEnum}; +use clap::ValueEnum; #[derive(ValueEnum, Copy, Clone, Debug, PartialEq, Eq)] pub enum ColorWhen { @@ -10,7 +10,7 @@ pub enum ColorWhen { } impl ColorWhen { - pub fn use_colors(&self) -> bool { + pub fn use_colors(self) -> bool { match self { ColorWhen::Always => true, ColorWhen::Auto => { diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs index 6c31e981..4c62066e 100644 --- a/backend/sync_server/src/main.rs +++ b/backend/sync_server/src/main.rs @@ -14,7 +14,7 @@ use cli::args::Args; use errors::{SyncServerError, init_error}; use log::info; use server::create_server; -use tracing_subscriber::{EnvFilter, fmt::format, layer::SubscriberExt, util::SubscriberInitExt}; +use tracing_subscriber::{EnvFilter, fmt::format, util::SubscriberInitExt}; #[tokio::main] async fn main() -> ExitCode { @@ -27,9 +27,9 @@ async fn main() -> ExitCode { } match result { - Ok(_) => ExitCode::SUCCESS, + Ok(()) => ExitCode::SUCCESS, Err(e) => { - eprintln!("Failed to set up logging: {}", e); + eprintln!("Failed to set up logging: {e}"); ExitCode::FAILURE } } @@ -38,9 +38,7 @@ async fn main() -> ExitCode { fn set_up_logging(args: &Args) -> Result<(), SyncServerError> { let level_filter = match args.verbose.log_level_filter() { // We don't want to allow disabling all logging - log::LevelFilter::Off => tracing::Level::ERROR, - - log::LevelFilter::Error => tracing::Level::ERROR, + log::LevelFilter::Off | log::LevelFilter::Error => tracing::Level::ERROR, log::LevelFilter::Warn => tracing::Level::WARN, log::LevelFilter::Info => tracing::Level::INFO, log::LevelFilter::Debug => tracing::Level::DEBUG,