From a943d0367c367e0334f28af73f335cd75b57dcde Mon Sep 17 00:00:00 2001 From: Ben C Date: Thu, 12 Mar 2026 18:40:49 -0400 Subject: [PATCH] Clippy fixes --- src/brain.rs | 2 +- src/cmd/load_chain.rs | 2 +- src/main.rs | 4 ++-- src/on_message.rs | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/brain.rs b/src/brain.rs index 0942cd1..9a4ae80 100644 --- a/src/brain.rs +++ b/src/brain.rs @@ -243,7 +243,7 @@ impl Brain { Self( map.into_iter() .map(|(k, v)| { - let sum = v.values().map(|w| *w as u64).sum::() as u64; + let sum = v.values().map(|w| *w as u64).sum::(); let edges = Edges( v.into_iter() .map(|(t, w)| (Self::read_legacy_token(t), w)) diff --git a/src/cmd/load_chain.rs b/src/cmd/load_chain.rs index a0d6ae8..6ff9475 100644 --- a/src/cmd/load_chain.rs +++ b/src/cmd/load_chain.rs @@ -54,7 +54,7 @@ impl LoadChainCommand { let mut brain = ctx.brain_handle.write().await; brain.merge_from(new_brain); ctx.pending_save.store(true, Ordering::Relaxed); - update_status(&*brain, &ctx.shard_sender).context("Failed to update status")?; + update_status(&brain, &ctx.shard_sender).context("Failed to update status")?; } client diff --git a/src/main.rs b/src/main.rs index 27925ef..66f3e6e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -81,7 +81,7 @@ async fn handle_discord_event(event: Event, ctx: Arc) -> Result { Event::Ready(ev) => { info!("Connected to gateway as {}", ev.user.name); let brain = ctx.brain_handle.read().await; - update_status(&*brain, &ctx.shard_sender).context("Failed to update status on ready") + update_status(&brain, &ctx.shard_sender).context("Failed to update status on ready") } _ => Ok(()), } @@ -101,7 +101,7 @@ fn load_brain(path: &Path) -> Result> { let mut file = File::open(path).context("Failed to open brain file")?; let mut brotli_stream = brotli::Decompressor::new(&mut file, BROTLI_BUF_SIZE); rmp_serde::from_read(&mut brotli_stream) - .map(|b| Some(b)) + .map(Some) .context("Failed to decode brain file") } else { Ok(None) diff --git a/src/on_message.rs b/src/on_message.rs index 2c36ef1..02b98e2 100644 --- a/src/on_message.rs +++ b/src/on_message.rs @@ -17,11 +17,11 @@ use crate::{BotContext, prelude::*, status::update_status}; async fn learn_message(msg: &str, ctx: Arc) -> Result { let mut brain = ctx.brain_handle.write().await; - let learned_new_word = brain.ingest(&msg); + let learned_new_word = brain.ingest(msg); ctx.pending_save.store(true, Ordering::Relaxed); if learned_new_word { - update_status(&*brain, &ctx.shard_sender).context("Failed to update status")?; + update_status(&brain, &ctx.shard_sender).context("Failed to update status")?; } Ok(()) @@ -40,17 +40,17 @@ async fn reply_message( let ctx_typ = ctx.clone(); let typ_id = channel_id; tokio::spawn(async move { - if typ_rx.await.ok().is_some_and(|start| start) { - if let Err(why) = ctx_typ.http.create_typing_trigger(typ_id).await { - warn!("Failed to set typing indicator:\n{why:?}"); - } + if typ_rx.await.ok().is_some_and(|start| start) + && let Err(why) = ctx_typ.http.create_typing_trigger(typ_id).await + { + warn!("Failed to set typing indicator:\n{why:?}"); } done_tx.send(()).ok(); }); let brain = ctx.brain_handle.read().await; if let Some(reply_text) = brain - .respond(&msg, is_self, Some(typ_tx)) + .respond(msg, is_self, Some(typ_tx)) .filter(|s| !s.trim().is_empty()) { drop(brain); -- 2.51.2