From 5062139ad6e6431212a3501658fd2e3cad693940 Mon Sep 17 00:00:00 2001 From: hulxv Date: Thu, 23 Oct 2025 01:38:22 +0300 Subject: [PATCH 1/2] fix: clippy around the codebase --- crates/logger/src/lib.rs | 4 ++-- crates/metassr-server/src/lib.rs | 4 ++-- crates/metassr-server/src/live_reload.rs | 2 +- crates/metassr-server/src/rebuilder.rs | 6 +++--- crates/metassr-watcher/src/lib.rs | 1 - crates/metassr-watcher/src/utils.rs | 19 ++++++------------- metassr-cli/src/cli/creator.rs | 1 - metassr-cli/src/cli/dev.rs | 10 +++++----- 8 files changed, 19 insertions(+), 28 deletions(-) diff --git a/crates/logger/src/lib.rs b/crates/logger/src/lib.rs index 8411aec..a1e683d 100644 --- a/crates/logger/src/lib.rs +++ b/crates/logger/src/lib.rs @@ -77,7 +77,7 @@ struct LogFormat<'a> { target: Option<&'a String>, fields: HashMap, } -impl<'a> LogFormat<'a> { +impl LogFormat<'_> { /// Formatting logs with styling & colors pub fn with_ansi(&mut self) -> String { format!( @@ -158,7 +158,7 @@ impl<'a> LogFormat<'a> { struct LogVisitor<'a>(&'a mut HashMap); -impl<'a> tracing::field::Visit for LogVisitor<'a> { +impl tracing::field::Visit for LogVisitor<'_> { fn record_f64(&mut self, field: &tracing::field::Field, value: f64) { self.0.insert(field.name().to_string(), value.to_string()); } diff --git a/crates/metassr-server/src/lib.rs b/crates/metassr-server/src/lib.rs index 67b1808..8caf367 100644 --- a/crates/metassr-server/src/lib.rs +++ b/crates/metassr-server/src/lib.rs @@ -114,10 +114,10 @@ impl Server { ); if let Some(rebuilder) = self.configs.rebuilder.clone() { tokio::spawn(async move { - while let Ok((stream, addr)) = ws_listener.accept().await { + while let Ok((stream, _)) = ws_listener.accept().await { let live_reload = LiveReloadServer::new(rebuilder.subscribe()); // live_reload.handle_connection(socket).await; - tokio::spawn(live_reload.handle_connection(stream, addr)); + tokio::spawn(live_reload.handle_connection(stream)); } }); } diff --git a/crates/metassr-server/src/live_reload.rs b/crates/metassr-server/src/live_reload.rs index 09bf4cb..968d597 100644 --- a/crates/metassr-server/src/live_reload.rs +++ b/crates/metassr-server/src/live_reload.rs @@ -40,7 +40,7 @@ impl LiveReloadServer { Self { receiver } } - pub async fn handle_connection(mut self, stream: TcpStream, addr: std::net::SocketAddr) { + pub async fn handle_connection(mut self, stream: TcpStream) { let ws_stream = tokio_tungstenite::accept_async(stream) .await .expect("Error during websocket handshake"); diff --git a/crates/metassr-server/src/rebuilder.rs b/crates/metassr-server/src/rebuilder.rs index d53f3ba..f0f1d1a 100644 --- a/crates/metassr-server/src/rebuilder.rs +++ b/crates/metassr-server/src/rebuilder.rs @@ -20,7 +20,7 @@ use std::time::Instant; use notify_debouncer_full::DebouncedEvent; -use tracing::{debug, error, info}; +use tracing::{debug, error}; #[derive(Clone, Debug)] pub enum RebuildType { @@ -210,8 +210,8 @@ impl Rebuilder { Ok(()) } + #[allow(dead_code)] async fn rebuild_all_pages(&self) -> Result<()> { - // todo: itereate entered rebuilding "rebuild_page fn-" on all pages - Ok(()) + todo!("itereate entered rebuilding rebuild_page() on all pages") } } diff --git a/crates/metassr-watcher/src/lib.rs b/crates/metassr-watcher/src/lib.rs index 10f7656..f0a6aa7 100644 --- a/crates/metassr-watcher/src/lib.rs +++ b/crates/metassr-watcher/src/lib.rs @@ -4,7 +4,6 @@ use notify::RecursiveMode; use notify_debouncer_full::{self, DebounceEventResult, DebouncedEvent}; use std::{path::Path, time::Duration}; use tokio::sync::broadcast; -use utils::{format_event, is_relevant_event}; pub struct FileWatcher { watcher: notify_debouncer_full::Debouncer< diff --git a/crates/metassr-watcher/src/utils.rs b/crates/metassr-watcher/src/utils.rs index d5278f6..88ad290 100644 --- a/crates/metassr-watcher/src/utils.rs +++ b/crates/metassr-watcher/src/utils.rs @@ -1,21 +1,14 @@ +use notify::event::ModifyKind; +use notify::EventKind::*; use notify_debouncer_full::DebouncedEvent; pub fn is_relevant_event(event: &DebouncedEvent) -> bool { - use notify::event::ModifyKind; - use notify::EventKind::*; - - match event.kind { - Create(_) => true, - Modify(ModifyKind::Data(_)) => true, - Modify(ModifyKind::Name(_)) => true, - Remove(_) => true, - _ => false, - } + matches!( + event.kind, + Create(_) | Modify(ModifyKind::Data(_)) | Modify(ModifyKind::Name(_)) | Remove(_) + ) } pub fn format_event(event: &DebouncedEvent) -> String { - use notify::event::ModifyKind; - use notify::EventKind::*; - let action = match event.kind { Create(_) => "created", Modify(ModifyKind::Data(_)) => "modified", diff --git a/metassr-cli/src/cli/creator.rs b/metassr-cli/src/cli/creator.rs index 9e22a69..e8aa11b 100644 --- a/metassr-cli/src/cli/creator.rs +++ b/metassr-cli/src/cli/creator.rs @@ -1,5 +1,4 @@ use clap::ValueEnum; -use inquire; use metassr_create::Creator as MetassrCreator; use std::{fmt::Display, str::FromStr}; use tracing::{error, info}; diff --git a/metassr-cli/src/cli/dev.rs b/metassr-cli/src/cli/dev.rs index 085bda0..b5d42bf 100644 --- a/metassr-cli/src/cli/dev.rs +++ b/metassr-cli/src/cli/dev.rs @@ -12,7 +12,7 @@ use metassr_server::rebuilder::{RebuildType, Rebuilder}; use metassr_server::{RunningType, Server, ServerConfigs}; use metassr_watcher::FileWatcher; -use tracing::{debug, error, info}; +use tracing::{debug, error}; use super::traits::AsyncExec; @@ -70,12 +70,12 @@ impl Dev { match rebuilder.handle_event(event) { Ok(rebuild_type) => { // Notify the server about what needs rebuilding - if let Err(e) = rebuild_tx.send(rebuild_type) { - error!("Error sending rebuild notification: {}", e); + if let Err(err) = rebuild_tx.send(rebuild_type) { + error!("Error sending rebuild notification: {}", err); } } - Err(e) => { - // error!("Error handling file change: {}", e) + Err(err) => { + error!("Error handling file change: {}", err) } } } From 7fcea4e46915cd14c98008bbdb01ff01eebe6236 Mon Sep 17 00:00:00 2001 From: Mohamed Emad Date: Thu, 23 Oct 2025 01:40:27 +0300 Subject: [PATCH 2/2] fix typo Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- crates/metassr-server/src/rebuilder.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/metassr-server/src/rebuilder.rs b/crates/metassr-server/src/rebuilder.rs index f0f1d1a..43e3bbd 100644 --- a/crates/metassr-server/src/rebuilder.rs +++ b/crates/metassr-server/src/rebuilder.rs @@ -212,6 +212,6 @@ impl Rebuilder { #[allow(dead_code)] async fn rebuild_all_pages(&self) -> Result<()> { - todo!("itereate entered rebuilding rebuild_page() on all pages") + todo!("iterate entered rebuilding rebuild_page() on all pages") } }