feat: bump msrv to 1.89, resolve clippy lints (#105)

fdnt7 · web-flow · commit d58552bf873e · 2025-08-07T23:01:35.000+07:00
* chore: update flake.lock

* chore: update Cargo.lock, bump cargo dependencies

* feat: bump msrv to 1.89

* refactor: resolve clippy 1.89 lints
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ readme = "README.md"
 description = "A featureful, self-hostable Discord music bot."
 version = "0.9.2"
 edition = "2024"
-rust-version = "1.88" # when bumping, bump in `Dockerfile` too.
+rust-version = "1.89" # when bumping, bump in `Dockerfile` too.
 license = "GPL-3.0"
 repository = "https://github.com/lyra-music/lyra"
 authors = ["fdnt7"]
@@ -29,7 +29,7 @@ itertools = "0.14.0"
 regex = "1.11.1"
 serde = "1.0.219"
 rayon = "1.10.0"
-const-str = "0.6.3"
+const-str = "0.6.4"
 
 [profile.release]
 lto = true
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lukemathwalker/cargo-chef:latest-rust-1.88-bookworm AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1.89-bookworm AS chef
 WORKDIR /app
 
 # The generated recipe.json should only change if the dependencies changed
diff --git a/flake.lock b/flake.lock
diff --git a/lyra/Cargo.toml b/lyra/Cargo.toml
@@ -28,25 +28,25 @@ serde.workspace = true
 rayon.workspace = true
 const-str.workspace = true
 paste = "1.0.15"
-const_panic = { version = "0.2.12", features = ["derive"] }
+const_panic = { version = "0.2.13", features = ["derive"] }
 dotenvy = "0.15.7"
 dotenvy_macro = "0.15.7"
 thiserror = "2.0.12"
 color-eyre = "0.6.5"
 futures = "0.3.31"
-tokio = { version = "1.46.1", features = [
+tokio = { version = "1.47.1", features = [
     "sync",
     "signal",
     "rt-multi-thread",
     "macros",
 ] }
-serde_json = "1.0.140"
+serde_json = "1.0.142"
 linkify = "0.10.0"
 fuzzy-matcher = "0.3.7"
 log = "0.4.27"
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
-rand = "0.9.1"
+rand = "0.9.2"
 sqlx = { version = "0.8.6", features = [
     "postgres",
     "runtime-tokio",
@@ -89,5 +89,5 @@ reqwest = { version = "0.12.22", default-features = false, features = [
     "charset",
     "rustls-tls-native-roots",
 ] }
-rustls = "0.23.29"
+rustls = "0.23.31"
 derive_builder = "0.20.2"
diff --git a/lyra/src/command/check.rs b/lyra/src/command/check.rs
@@ -186,11 +186,14 @@ pub fn noone_else_in(
     Ok(())
 }
 
-pub struct PollStarter(PollStarterInfo);
+pub struct PollStarter(#[expect(unused)] PollStarterInfo);
 
 pub struct PollStarterInfo {
+    #[expect(unused)]
     topic: PollTopic,
+    #[expect(unused)]
     error: PollResolvableError,
+    #[expect(unused)]
     in_voice: PartialInVoice,
 }
 
@@ -318,10 +321,10 @@ pub fn track_is_users(
     in_voice_with_user: InVoiceWithUserResult,
 ) -> Result<(), check::UsersTrackError> {
     let author_id = in_voice_with_user.in_voice.author_id;
-    if let Err(user_only_in) = in_voice_with_user.only() {
-        if track.requester() != author_id {
-            return Err(impl_users_track(track, position, user_only_in));
-        }
+    if let Err(user_only_in) = in_voice_with_user.only()
+        && track.requester() != author_id
+    {
+        return Err(impl_users_track(track, position, user_only_in));
     }
 
     Ok(())
@@ -726,6 +729,7 @@ pub fn all_users_track(
 // }
 //
 
+#[expect(unused)]
 async fn handle_poll(
     error: check::PollResolvableError,
     topic: &PollTopic,
diff --git a/lyra/src/command/model/ctx/mod.rs b/lyra/src/command/model/ctx/mod.rs
@@ -192,7 +192,7 @@ impl<T: CtxKind> Ctx<T, GuildMarker> {
         }
     }
 
-    pub fn bot_member(&self) -> CacheResult<CachedBotMember> {
+    pub fn bot_member(&'_ self) -> CacheResult<CachedBotMember<'_>> {
         self.cache()
             .member(self.guild_id(), self.bot().user_id())
             .ok_or(Cache)
@@ -238,7 +238,7 @@ impl<T: CtxKind> Ctx<T, GuildMarker> {
         )
     }
 
-    pub fn current_voice_state(&self) -> Option<CachedVoiceStateRef> {
+    pub fn current_voice_state(&'_ self) -> Option<CachedVoiceStateRef<'_>> {
         let user = self.bot().user_id();
         self.cache().voice_state(user, self.guild_id())
     }
diff --git a/lyra/src/command/require.rs b/lyra/src/command/require.rs
@@ -189,7 +189,7 @@ impl GuildIdAware for PartialInVoice {
     }
 }
 
-pub fn in_voice<T: CtxKind>(ctx: &GuildCtx<T>) -> Result<InVoice, NotInVoice> {
+pub fn in_voice<T: CtxKind>(ctx: &'_ GuildCtx<T>) -> Result<InVoice<'_>, NotInVoice> {
     Ok(InVoice::new(
         ctx.current_voice_state().ok_or(NotInVoice)?.into(),
         ctx,
@@ -312,7 +312,7 @@ where
     Ok(queue)
 }
 
-pub fn current_track(queue: &Queue) -> Result<CurrentTrack, NotPlaying> {
+pub fn current_track(queue: &'_ Queue) -> Result<CurrentTrack<'_>, NotPlaying> {
     let (current, position) = queue.current_and_position();
     Ok(CurrentTrack {
         track: current.ok_or(NotPlaying)?,
diff --git a/lyra/src/component/tuning/mod.rs b/lyra/src/component/tuning/mod.rs
@@ -26,8 +26,8 @@ use crate::{
 
 #[inline]
 fn require_in_voice_unsuppressed_and_player(
-    ctx: &GuildCtx<impl CtxKind>,
-) -> Result<(InVoice, PlayerInterface), RequireInVoiceUnsuppressedAndPlayerError> {
+    ctx: &'_ GuildCtx<impl CtxKind>,
+) -> Result<(InVoice<'_>, PlayerInterface), RequireInVoiceUnsuppressedAndPlayerError> {
     let in_voice = require::in_voice(ctx)?.and_unsuppressed()?;
     let player = require::player(ctx)?;
 
diff --git a/lyra/src/core/model/mod.rs b/lyra/src/core/model/mod.rs
@@ -300,7 +300,7 @@ impl<T: UserAware> UserGlobalNameAware for T {
 }
 
 pub trait BotStateAware {
-    fn bot(&self) -> BotStateRef;
+    fn bot(&'_ self) -> BotStateRef<'_>;
 }
 
 pub trait OwnedBotStateAware: BotStateAware {
diff --git a/lyra/src/error/command/check.rs b/lyra/src/error/command/check.rs
@@ -1,14 +1,11 @@
 use thiserror::Error;
 
 use crate::error::{
-    self, Cache as CacheError, InVoiceWithoutUser as InVoiceWithoutUserError, NotInVoice,
-    NotUsersTrack as NotUsersTrackError, PrettyErrorDisplay, PrettyInVoiceWithSomeoneElseDisplayer,
-    PrettyNotUsersTrackDisplayer, PrettyQueueNotSeekableDisplayer,
-    QueueNotSeekable as QueueNotSeekableError,
+    self, Cache as CacheError, NotUsersTrack as NotUsersTrackError, PrettyErrorDisplay,
+    PrettyInVoiceWithSomeoneElseDisplayer, PrettyNotUsersTrackDisplayer,
+    PrettyQueueNotSeekableDisplayer, QueueNotSeekable as QueueNotSeekableError,
 };
 
-use super::require::UnsuppressedError;
-
 #[derive(Error, Debug)]
 #[error(transparent)]
 pub enum AccessCalculatorBuildError {
@@ -30,28 +27,6 @@ pub enum UserOnlyInError {
     InVoiceWithSomeoneElse(#[from] crate::error::InVoiceWithSomeoneElse),
 }
 
-#[derive(Error, Debug)]
-#[error(transparent)]
-pub enum InVoiceWithUserError {
-    NotInVoice(#[from] NotInVoice),
-    InVoiceWithoutUser(#[from] InVoiceWithoutUserError),
-}
-
-#[derive(Error, Debug)]
-#[error(transparent)]
-pub enum InVoiceWithUserOnlyError {
-    NotInVoice(#[from] NotInVoice),
-    InVoiceWithoutUser(#[from] InVoiceWithoutUserError),
-    UserOnlyIn(#[from] UserOnlyInError),
-}
-
-#[derive(Error, Debug)]
-#[error(transparent)]
-pub enum CurrentlyPlayingUsersTrackError {
-    NotPlaying(#[from] error::NotPlaying),
-    NotUsersTrack(#[from] NotUsersTrackError),
-}
-
 #[derive(Error, Debug)]
 #[error(transparent)]
 pub enum QueueSeekableError {
@@ -193,31 +168,3 @@ pub enum PollLossErrorKind {
     TimedOut,
     SupersededLossViaDj,
 }
-
-#[derive(Error, Debug)]
-#[error(transparent)]
-pub enum HandleInVoiceWithSomeoneElseError {
-    PollResolvable(#[from] PollResolvableError),
-    HandlePoll(#[from] HandlePollError),
-}
-
-#[derive(Error, Debug)]
-#[error(transparent)]
-pub enum RunError {
-    NotInVoice(#[from] NotInVoice),
-    QueueEmpty(#[from] error::QueueEmpty),
-    NotSuppressed(#[from] UnsuppressedError),
-    NotPlaying(#[from] error::NotPlaying),
-    InVoiceWithoutUser(#[from] InVoiceWithoutUserError),
-    HandleInVoiceWithSomeoneElse(#[from] HandleInVoiceWithSomeoneElseError),
-    Cache(#[from] CacheError),
-    Paused(#[from] error::Paused),
-    Stopped(#[from] error::Stopped),
-}
-
-#[derive(Error, Debug)]
-#[error(transparent)]
-pub enum OnlyElsePoll {
-    Cache(#[from] CacheError),
-    HandlePoll(#[from] HandlePollError),
-}
diff --git a/lyra/src/error/command/mod.rs b/lyra/src/error/command/mod.rs
@@ -4,13 +4,6 @@ pub mod poll;
 pub mod require;
 pub mod util;
 
-#[derive(thiserror::Error, Debug)]
-#[error("creating a followup failed: {}", .0)]
-pub enum FollowupError {
-    DeserialiseBodyFromHttp(#[from] super::core::DeserialiseBodyFromHttpError),
-    Followup(#[from] super::core::FollowupError),
-}
-
 #[derive(thiserror::Error, Debug)]
 #[error("command failed: {}", .0)]
 pub enum Error {
diff --git a/lyra/src/error/component/misc/ping.rs b/lyra/src/error/component/misc/ping.rs
@@ -7,6 +7,7 @@ use crate::error::core::RespondError;
 pub enum PingError {
     Respond(#[from] RespondError),
     #[error("no heartbeat has been sent")]
+    #[expect(unused)]
     NoHeartbeatSent,
 }
 
diff --git a/lyra/src/error/mod.rs b/lyra/src/error/mod.rs
@@ -40,10 +40,6 @@ pub struct UserNotStageModerator;
 #[error("user is not an access manager")]
 pub struct UserNotAccessManager;
 
-#[derive(Debug, Error)]
-#[error("user is not a playlist manager")]
-pub struct UserNotPlaylistManager;
-
 #[derive(Error, Debug)]
 #[error("user is not allowed to do this")]
 pub struct UserNotAllowed;
@@ -187,10 +183,6 @@ pub enum PositionOutOfRange {
 #[error("player is paused")]
 pub struct Paused;
 
-#[derive(Error, Debug)]
-#[error("player is stopped")]
-pub struct Stopped;
-
 #[derive(Error, Debug)]
 #[error("queue is empty")]
 pub struct QueueEmpty;
@@ -199,10 +191,6 @@ pub struct QueueEmpty;
 #[error("failed to load track: {}", .0)]
 pub struct LoadFailed(pub Box<str>);
 
-#[derive(PartialEq, Eq, Error, Debug)]
-#[error("invalid timestamp")]
-pub struct PrettifiedTimestampParse;
-
 #[derive(Error, Debug)]
 #[error("error running the bot starter: {}", .0)]
 pub enum Run {
diff --git a/lyra/src/lavalink/model/mod.rs b/lyra/src/lavalink/model/mod.rs
@@ -89,7 +89,7 @@ pub trait ClientAndGuildIdAware: ClientAware + GuildIdAware {
             .disable_vsu_handler()
     }
 
-    fn get_conn(&self) -> ConnectionHandle {
+    fn get_conn(&'_ self) -> ConnectionHandle<'_> {
         self.lavalink().handle_for(self.guild_id())
     }
 }
diff --git a/lyra_ext/Cargo.toml b/lyra_ext/Cargo.toml
@@ -16,7 +16,7 @@ unicode-segmentation = "1"
 
 [dev-dependencies]
 const-str.workspace = true
-rstest = "0.25.0"
+rstest = "0.26.1"
 mock_instant = "0.6.0"
 hexf = "0.2.1"
 
diff --git a/lyra_ext/src/as_grapheme.rs b/lyra_ext/src/as_grapheme.rs
@@ -7,7 +7,7 @@ pub trait AsGrapheme: UnicodeSegmentation {
         self.graphemes(true).count()
     }
 
-    fn grapheme_truncate(&self, new_len: usize) -> Cow<Self>
+    fn grapheme_truncate(&'_ self, new_len: usize) -> Cow<'_, Self>
     where
         Self: ToOwned,
         Self::Owned: for<'a> FromIterator<&'a str>,
diff --git a/lyra_ext/src/image/limit_file_size.rs b/lyra_ext/src/image/limit_file_size.rs
@@ -5,11 +5,11 @@ use image::{DynamicImage, GenericImageView, imageops::FilterType};
 use crate::num::f64_as_u32;
 
 pub trait LimitFileSize {
-    fn limit_file_size(&self, limit: u32) -> Cow<DynamicImage>;
+    fn limit_file_size(&'_ self, limit: u32) -> Cow<'_, DynamicImage>;
 }
 
 impl LimitFileSize for DynamicImage {
-    fn limit_file_size(&self, limit: u32) -> Cow<DynamicImage> {
+    fn limit_file_size(&'_ self, limit: u32) -> Cow<'_, DynamicImage> {
         let (x, y) = self.dimensions();
         let bytes_per_pixel = self.color().bytes_per_pixel();
 
diff --git a/lyra_ext/src/logical_bind.rs b/lyra_ext/src/logical_bind.rs
@@ -3,7 +3,7 @@ use std::borrow::Cow;
 pub trait LogicalBind {
     fn is_truthy(&self) -> bool;
 
-    fn or(&self, other: impl Into<<Self as ToOwned>::Owned>) -> Cow<Self>
+    fn or(&'_ self, other: impl Into<<Self as ToOwned>::Owned>) -> Cow<'_, Self>
     where
         Self: ToOwned,
     {
@@ -13,7 +13,7 @@ pub trait LogicalBind {
         Cow::Owned(other.into())
     }
 
-    fn or_else(&self, f: impl FnOnce() -> <Self as ToOwned>::Owned) -> Cow<Self>
+    fn or_else(&'_ self, f: impl FnOnce() -> <Self as ToOwned>::Owned) -> Cow<'_, Self>
     where
         Self: ToOwned,
     {
diff --git a/lyra_ext/src/pretty/flags_display.rs b/lyra_ext/src/pretty/flags_display.rs
@@ -35,14 +35,14 @@ where
 }
 
 pub trait FlagsDisplay: Flags {
-    fn pretty_display(&self) -> PrettyFlagsDisplayer<Self> {
+    fn pretty_display(&'_ self) -> PrettyFlagsDisplayer<'_, Self> {
         PrettyFlagsDisplayer {
             inner: self,
             code: false,
         }
     }
 
-    fn pretty_display_code(&self) -> PrettyFlagsDisplayer<Self> {
+    fn pretty_display_code(&'_ self) -> PrettyFlagsDisplayer<'_, Self> {
         PrettyFlagsDisplayer {
             inner: self,
             code: true,
diff --git a/lyra_ext/src/pretty/truncate.rs b/lyra_ext/src/pretty/truncate.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM lukemathwalker/cargo-chef:latest-rust-1.88-bookworm AS chef`
	`1`	`+FROM lukemathwalker/cargo-chef:latest-rust-1.89-bookworm AS chef`
`2`	`2`	`WORKDIR /app`
`3`	`3`
`4`	`4`	`# The generated recipe.json should only change if the dependencies changed`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ impl<T: CtxKind> Ctx<T, GuildMarker> {`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`
`195`		`- pub fn bot_member(&self) -> CacheResult<CachedBotMember> {`
	`195`	`+ pub fn bot_member(&'_ self) -> CacheResult<CachedBotMember<'_>> {`
`196`	`196`	`self.cache()`
`197`	`197`	`.member(self.guild_id(), self.bot().user_id())`
`198`	`198`	`.ok_or(Cache)`
`@@ -238,7 +238,7 @@ impl<T: CtxKind> Ctx<T, GuildMarker> {`
`238`	`238`	`)`
`239`	`239`	`}`
`240`	`240`
`241`		`- pub fn current_voice_state(&self) -> Option<CachedVoiceStateRef> {`
	`241`	`+ pub fn current_voice_state(&'_ self) -> Option<CachedVoiceStateRef<'_>> {`
`242`	`242`	`let user = self.bot().user_id();`
`243`	`243`	`self.cache().voice_state(user, self.guild_id())`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ impl GuildIdAware for PartialInVoice {`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`192`		`-pub fn in_voice<T: CtxKind>(ctx: &GuildCtx<T>) -> Result<InVoice, NotInVoice> {`
	`192`	`+pub fn in_voice<T: CtxKind>(ctx: &'_ GuildCtx<T>) -> Result<InVoice<'_>, NotInVoice> {`
`193`	`193`	`Ok(InVoice::new(`
`194`	`194`	`ctx.current_voice_state().ok_or(NotInVoice)?.into(),`
`195`	`195`	`ctx,`
`@@ -312,7 +312,7 @@ where`
`312`	`312`	`Ok(queue)`
`313`	`313`	`}`
`314`	`314`
`315`		`-pub fn current_track(queue: &Queue) -> Result<CurrentTrack, NotPlaying> {`
	`315`	`+pub fn current_track(queue: &'_ Queue) -> Result<CurrentTrack<'_>, NotPlaying> {`
`316`	`316`	`let (current, position) = queue.current_and_position();`
`317`	`317`	`Ok(CurrentTrack {`
`318`	`318`	`track: current.ok_or(NotPlaying)?,`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ impl<T: UserAware> UserGlobalNameAware for T {`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`pub trait BotStateAware {`
`303`		`- fn bot(&self) -> BotStateRef;`
	`303`	`+ fn bot(&'_ self) -> BotStateRef<'_>;`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`pub trait OwnedBotStateAware: BotStateAware {`