From d9af3725c5b4b8df91671fd425b734ee30924d8e Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Wed, 17 Dec 2025 18:54:10 -0500 Subject: fix check lints --- src/bot.rs | 6 +++--- src/lib.rs | 1 - src/util/mod.rs | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/bot.rs b/src/bot.rs index 2f44ba5..ac283db 100644 --- a/src/bot.rs +++ b/src/bot.rs @@ -1,11 +1,11 @@ use crate::{ + PoiseContext, + PoiseData, commands, config::CONFIG, err_msg, util, util::OAUTH_URL, - PoiseContext, - PoiseData, }; use chrono::Datelike; use dashmap::DashMap; @@ -276,7 +276,7 @@ fn on_err(err: FrameworkError) -> BoxFuture<()> { fn noop( _ctx: PrefixContext<'_, U, E>, - ) -> BoxFuture>> { + ) -> BoxFuture<'_, Result<(), FrameworkError<'_, U, E>>> { Box::pin(async { Ok(()) }) } diff --git a/src/lib.rs b/src/lib.rs index 1f03290..a45f9fb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,4 @@ #![feature(try_blocks)] -#![feature(let_chains)] #![feature(maybe_uninit_slice)] #[cfg(feature = "db")] diff --git a/src/util/mod.rs b/src/util/mod.rs index 395d264..db85a9b 100644 --- a/src/util/mod.rs +++ b/src/util/mod.rs @@ -37,9 +37,9 @@ use tap::Pipe; use url::Url; use crate::{ - commands::playback::songbird, - PoiseContext, CONFIG, + PoiseContext, + commands::playback::songbird, }; mod rest_vec; @@ -140,7 +140,7 @@ pub async fn send( pub async fn reply( ctx: poise::Context<'_, U, E>, text: impl AsRef, -) -> Result { +) -> Result, serenity::Error> { let handle = poise::send_reply( ctx, CreateReply::default() @@ -185,7 +185,7 @@ pub fn guild(ctx: PoiseContext<'_>) -> anyhow::Result> { } #[inline] -pub fn author_voice_state(ctx: PoiseContext<'_>) -> Option<(VoiceState, GuildRef)> { +pub fn author_voice_state(ctx: PoiseContext<'_>) -> Option<(VoiceState, GuildRef<'_>)> { let guild = ctx.guild()?; let caller_voice = guild.voice_states.get(&ctx.author().id)?.clone(); -- cgit v1.3.1