diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bot.rs | 6 | ||||
| -rw-r--r-- | src/lib.rs | 1 | ||||
| -rw-r--r-- | src/util/mod.rs | 8 |
3 files changed, 7 insertions, 8 deletions
@@ -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<PoiseData, anyhow::Error>) -> BoxFuture<()> { fn noop<U, E>( _ctx: PrefixContext<'_, U, E>, - ) -> BoxFuture<Result<(), FrameworkError<U, E>>> { + ) -> BoxFuture<'_, Result<(), FrameworkError<'_, U, E>>> { Box::pin(async { Ok(()) }) } @@ -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<U, E>( ctx: poise::Context<'_, U, E>, text: impl AsRef<str>, -) -> Result<poise::ReplyHandle, serenity::Error> { +) -> Result<poise::ReplyHandle<'_>, serenity::Error> { let handle = poise::send_reply( ctx, CreateReply::default() @@ -185,7 +185,7 @@ pub fn guild(ctx: PoiseContext<'_>) -> anyhow::Result<GuildRef<'_>> { } #[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(); |
