Improve usage of FixedString (#3418)

Author: Joshix-1

Cargo.toml

@@ -41,7 +41,7 @@ base64 = { version = "0.22.0" }
 zeroize = { version = "1.7" } # Not used in serenity, but bumps the minimal version from secrecy
 arrayvec = { version = "0.7.4", features = ["serde"] }
 serde_cow = { version = "0.1.0" }
-small-fixed-array = { version = "0.4", features = ["serde"] }
+small-fixed-array = { version = "0.4.10", features = ["serde"] }
 bool_to_bitflags = { version = "0.1.2" }
 nonmax = { version = "0.5.5", features = ["serde"] }
 strum = { version = "0.26", features = ["derive"] }
@@ -154,4 +154,3 @@ native_tls_backend = [
 [package.metadata.docs.rs]
 features = ["full"]
 rustdoc-args = ["--cfg", "docsrs"]
-

src/builder/create_embed.rs

@@ -16,8 +16,6 @@
 
 use std::borrow::Cow;
 
-#[cfg(feature = "http")]
-use crate::internal::prelude::*;
 use crate::model::prelude::*;
 
 /// A builder to create an embed in a message
@@ -247,16 +245,16 @@ impl From<Embed> for CreateEmbed<'_> {
     fn from(embed: Embed) -> Self {
         Self {
             fields: embed.fields.into_iter().map(Into::into).collect(),
-            description: embed.description.map(FixedString::into_string).map(Into::into),
+            description: embed.description.map(Into::into),
             thumbnail: embed.thumbnail.map(Into::into),
             timestamp: embed.timestamp,
             kind: Some("rich"),
             author: embed.author.map(Into::into),
             colour: embed.colour,
             footer: embed.footer.map(Into::into),
             image: embed.image.map(Into::into),
-            title: embed.title.map(FixedString::into_string).map(Into::into),
-            url: embed.url.map(FixedString::into_string).map(Into::into),
+            title: embed.title.map(Into::into),
+            url: embed.url.map(Into::into),
         }
     }
 }
@@ -302,9 +300,9 @@ impl<'a> CreateEmbedAuthor<'a> {
 impl From<EmbedAuthor> for CreateEmbedAuthor<'_> {
     fn from(author: EmbedAuthor) -> Self {
         Self {
-            name: author.name.into_string().into(),
-            url: author.url.map(|f| f.into_string().into()),
-            icon_url: author.icon_url.map(|f| f.into_string().into()),
+            name: author.name.into(),
+            url: author.url.map(Into::into),
+            icon_url: author.icon_url.map(Into::into),
         }
     }
 }
@@ -360,8 +358,8 @@ impl<'a> CreateEmbedFooter<'a> {
 impl From<EmbedFooter> for CreateEmbedFooter<'_> {
     fn from(footer: EmbedFooter) -> Self {
         Self {
-            text: footer.text.into_string().into(),
-            icon_url: footer.icon_url.map(|f| f.into_string().into()),
+            text: footer.text.into(),
+            icon_url: footer.icon_url.map(Into::into),
         }
     }
 }
@@ -386,8 +384,8 @@ impl<'a> From<&'a EmbedField> for CreateEmbedField<'a> {
 impl From<EmbedField> for CreateEmbedField<'_> {
     fn from(field: EmbedField) -> Self {
         Self {
-            name: field.name.into_string().into(),
-            value: field.value.into_string().into(),
+            name: field.name.into(),
+            value: field.value.into(),
             inline: field.inline,
         }
     }
@@ -401,15 +399,15 @@ struct CreateEmbedImage<'a> {
 impl From<EmbedImage> for CreateEmbedImage<'_> {
     fn from(field: EmbedImage) -> Self {
         Self {
-            url: field.url.into_string().into(),
+            url: field.url.into(),
         }
     }
 }
 
 impl From<EmbedThumbnail> for CreateEmbedImage<'_> {
     fn from(field: EmbedThumbnail) -> Self {
         Self {
-            url: field.url.into_string().into(),
+            url: field.url.into(),
         }
     }
 }

src/builder/create_forum_tag.rs

@@ -39,7 +39,7 @@ impl<'a> CreateForumTag<'a> {
             },
             ReactionType::Unicode(unicode_emoji) => {
                 self.emoji_id = None;
-                self.emoji_name = Some(unicode_emoji.into_string().into());
+                self.emoji_name = Some(unicode_emoji.into());
             },
         }
         self

src/gateway/client/dispatch.rs

@@ -6,7 +6,6 @@ use super::{Context, FullEvent};
 use crate::cache::{Cache, CacheUpdate};
 #[cfg(feature = "framework")]
 use crate::framework::Framework;
-use crate::internal::prelude::*;
 use crate::internal::tokio::spawn_named;
 use crate::model::channel::ChannelType;
 use crate::model::event::Event;
@@ -380,11 +379,11 @@ fn update_cache_with_event(
             }
         },
         Event::VoiceChannelStatusUpdate(mut event) => {
-            let old = if_cache!(event.update(cache).map(FixedString::into_string));
+            let old = if_cache!(event.update(cache).map(Into::into));
 
             FullEvent::VoiceChannelStatusUpdate {
                 old,
-                status: event.status.map(FixedString::into_string),
+                status: event.status.map(Into::into),
                 id: event.id,
                 guild_id: event.guild_id,
             }

src/gateway/sharding/shard_manager.rs

@@ -202,8 +202,8 @@ impl ShardManager {
         // We must wait 5 seconds between IDENTIFYs to avoid session invalidations.
         if let Some(instant) = self.last_start {
             let elapsed = instant.elapsed();
-            if elapsed < self.wait_time_between_shard_start {
-                sleep(self.wait_time_between_shard_start - elapsed).await;
+            if let Some(duration) = self.wait_time_between_shard_start.checked_sub(elapsed) {
+                sleep(duration).await;
             }
         }
 

src/gateway/sharding/shard_queue.rs

@@ -13,8 +13,8 @@ pub struct ShardQueue {
 
 impl ShardQueue {
     pub fn new(max_concurrency: NonZeroU16) -> Self {
-        let buckets = vec![VecDeque::new(); max_concurrency.get() as usize].into_boxed_slice();
-        let buckets = FixedArray::try_from(buckets).expect("should fit without truncation");
+        let buckets = vec![VecDeque::new(); max_concurrency.get() as usize];
+        let buckets = buckets.try_into().expect("should fit without truncation");
 
         Self {
             buckets,

src/model/channel/reaction.rs

@@ -368,7 +368,7 @@ impl From<char> for ReactionType {
     /// # fn main() {}
     /// ```
     fn from(ch: char) -> ReactionType {
-        ReactionType::Unicode(ch.to_string().trunc_into())
+        ReactionType::Unicode(ch.into())
     }
 }