Fix clippy

Author: mkrasnitski

src/cache/wrappers.rs

@@ -123,7 +123,7 @@ pub(crate) struct MaybeOwnedArc<T>(
 #[cfg(feature = "temp_cache")]
 impl<T> MaybeOwnedArc<T> {
     pub(crate) fn new(inner: T) -> Self {
-        Self(Arc::new(inner).into())
+        Self(Arc::new(inner))
     }
 
     pub(crate) fn get_inner(self) -> Arc<T> {
@@ -159,6 +159,6 @@ impl<T> std::ops::Deref for MaybeOwnedArc<T> {
 #[cfg(feature = "temp_cache")]
 impl<T> Clone for MaybeOwnedArc<T> {
     fn clone(&self) -> Self {
-        Self(self.0.clone().into())
+        Self(Arc::clone(&self.0))
     }
 }

src/model/channel/channel_id.rs

@@ -55,8 +55,7 @@ impl ChannelId {
         guild_id: Option<GuildId>,
     ) -> Result<GuildChannel> {
         #[cfg(feature = "cache")]
-        // Ignore clippy, the two `if let`s must be separated
-        #[expect(clippy::collapsible_if)]
+        #[cfg_attr(not(feature = "temp_cache"), expect(clippy::collapsible_if))]
         if let Some(cache) = cache_http.cache() {
             if let Some(guild_id) = guild_id
                 && let Some(guild) = cache.guild(guild_id)

src/model/channel/mod.rs

@@ -191,6 +191,7 @@ impl Channel {
     }
 
     /// If this is a guild channel or guild thread, returns the corresponding guild's Id.
+    #[must_use]
     pub fn guild_id(&self) -> Option<GuildId> {
         match self {
             Channel::GuildThread(thread) => Some(thread.base.guild_id),

src/model/channel/thread.rs

@@ -33,8 +33,7 @@ impl ThreadId {
         guild_id: Option<GuildId>,
     ) -> Result<GuildThread> {
         #[cfg(feature = "cache")]
-        // Ignore clippy, the two `if let`s must be separated
-        #[expect(clippy::collapsible_if)]
+        #[cfg_attr(not(feature = "temp_cache"), expect(clippy::collapsible_if))]
         if let Some(cache) = cache_http.cache() {
             if let Some(guild_id) = guild_id
                 && let Some(guild) = cache.guild(guild_id)

src/model/user.rs

@@ -552,10 +552,10 @@ impl UserId {
         }
 
         #[cfg(feature = "temp_cache")]
-        if let Some(cache) = cache_http.cache() {
-            if let Some(private_channel) = cache.temp_private_channels.get(&self) {
-                return Ok(PrivateChannel::clone(&private_channel));
-            }
+        if let Some(cache) = cache_http.cache()
+            && let Some(private_channel) = cache.temp_private_channels.get(&self)
+        {
+            return Ok(PrivateChannel::clone(&private_channel));
         }
 
         let body = CreateDmChannel {
@@ -641,10 +641,10 @@ impl UserId {
     pub async fn to_user(self, cache_http: impl CacheHttp) -> Result<User> {
         #[cfg(feature = "temp_cache")]
         {
-            if let Some(cache) = cache_http.cache() {
-                if let Some(user) = cache.temp_users.get(&self) {
-                    return Ok(User::clone(&user));
-                }
+            if let Some(cache) = cache_http.cache()
+                && let Some(user) = cache.temp_users.get(&self)
+            {
+                return Ok(User::clone(&user));
             }
         }