Remove unstable cfg flag

Also changes the modal stuff back to CreateActionRow, no need for this
extra layer of nesting if modals only use ActionRow?

Author: jamesbt365

src/builder/create_components.rs

@@ -5,10 +5,8 @@ use serde::Serialize;
 use crate::model::prelude::*;
 
 #[derive(Clone, Debug)]
-#[cfg(feature = "unstable")]
 struct StaticU8<const VAL: u8>;
 
-#[cfg(feature = "unstable")]
 impl<const VAL: u8> Serialize for StaticU8<VAL> {
     fn serialize<S: serde::Serializer>(&self, ser: S) -> Result<S::Ok, S::Error> {
         ser.serialize_u8(VAL)
@@ -67,8 +65,7 @@ impl serde::Serialize for CreateActionRow<'_> {
 /// To send V2 components, you must set [`MessageFlags::IS_COMPONENTS_V2`].
 ///
 /// ### Limitations
-/// - You can include a maximum of **10 top-level components** per message.
-/// - The total number of **nested components** is limited to **30**.
+/// - The total number of components is limited to **40**..
 /// - The maximum character count for text within components is **4000**.
 /// - The ability to set the `content` and `embeds` field will be disabled
 /// - No support for audio files
@@ -77,7 +74,6 @@ impl serde::Serialize for CreateActionRow<'_> {
 #[derive(Clone, Debug, Serialize)]
 #[must_use]
 #[serde(untagged)]
-#[cfg(feature = "unstable")]
 pub enum CreateComponent<'a> {
     /// Represents an action row component (V1).
     ///
@@ -115,7 +111,6 @@ pub enum CreateComponent<'a> {
 /// accessory.
 #[derive(Clone, Debug, Serialize)]
 #[must_use]
-#[cfg(feature = "unstable")]
 pub struct CreateSection<'a> {
     #[serde(rename = "type")]
     kind: StaticU8<9>,
@@ -124,7 +119,6 @@ pub struct CreateSection<'a> {
     accessory: CreateSectionAccessory<'a>,
 }
 
-#[cfg(feature = "unstable")]
 impl<'a> CreateSection<'a> {
     /// Creates a new builder with the specified components and accessory.
     ///
@@ -171,22 +165,18 @@ impl<'a> CreateSection<'a> {
 #[derive(Clone, Debug, Serialize)]
 #[must_use]
 #[serde(untagged)]
-#[cfg(feature = "unstable")]
 pub enum CreateSectionComponent<'a> {
     TextDisplay(CreateTextDisplay<'a>),
 }
 
 /// A builder to create a text display component.
 #[derive(Clone, Debug, Serialize)]
-#[must_use]
-#[cfg(feature = "unstable")]
 pub struct CreateTextDisplay<'a> {
     #[serde(rename = "type")]
     kind: StaticU8<10>,
     content: Cow<'a, str>,
 }
 
-#[cfg(feature = "unstable")]
 impl<'a> CreateTextDisplay<'a> {
     /// Creates a new text display component.
     ///
@@ -202,6 +192,7 @@ impl<'a> CreateTextDisplay<'a> {
     /// [`Self::new`].
     ///
     /// Note: All components on a message shares the same **4000** character limit.
+    #[must_use]
     pub fn content(mut self, content: impl Into<Cow<'a, str>>) -> Self {
         self.content = content.into();
         self
@@ -212,7 +203,6 @@ impl<'a> CreateTextDisplay<'a> {
 #[derive(Clone, Debug, Serialize)]
 #[must_use]
 #[serde(untagged)]
-#[cfg(feature = "unstable")]
 pub enum CreateSectionAccessory<'a> {
     Thumbnail(CreateThumbnail<'a>),
     Button(CreateButton<'a>),
@@ -221,7 +211,6 @@ pub enum CreateSectionAccessory<'a> {
 /// A builder to create a thumbnail for a section.
 #[derive(Clone, Debug, Serialize)]
 #[must_use]
-#[cfg(feature = "unstable")]
 pub struct CreateThumbnail<'a> {
     #[serde(rename = "type")]
     kind: StaticU8<11>,
@@ -232,7 +221,6 @@ pub struct CreateThumbnail<'a> {
     spoiler: Option<bool>,
 }
 
-#[cfg(feature = "unstable")]
 impl<'a> CreateThumbnail<'a> {
     /// Creates a new thumbnail with a media item.
     pub fn new(media: CreateUnfurledMediaItem<'a>) -> Self {
@@ -266,12 +254,10 @@ impl<'a> CreateThumbnail<'a> {
 /// A builder to create a media item.
 #[derive(Clone, Debug, Serialize, Default)]
 #[must_use]
-#[cfg(feature = "unstable")]
 pub struct CreateUnfurledMediaItem<'a> {
     url: Cow<'a, str>,
 }
 
-#[cfg(feature = "unstable")]
 impl<'a> CreateUnfurledMediaItem<'a> {
     /// Creates a new media item.
     pub fn new(url: impl Into<Cow<'a, str>>) -> Self {
@@ -292,14 +278,12 @@ impl<'a> CreateUnfurledMediaItem<'a> {
 /// Note: May contain up to **10** items.
 #[derive(Clone, Debug, Serialize)]
 #[must_use]
-#[cfg(feature = "unstable")]
 pub struct CreateMediaGallery<'a> {
     #[serde(rename = "type")]
     kind: StaticU8<12>,
     items: Cow<'a, [CreateMediaGalleryItem<'a>]>,
 }
 
-#[cfg(feature = "unstable")]
 impl<'a> CreateMediaGallery<'a> {
     /// Creates a new media gallery with up to **10** items.
     pub fn new(items: impl Into<Cow<'a, [CreateMediaGalleryItem<'a>]>>) -> Self {
@@ -330,7 +314,6 @@ impl<'a> CreateMediaGallery<'a> {
 /// Builder to create individual media gallery items.
 #[derive(Clone, Debug, Serialize, Default)]
 #[must_use]
-#[cfg(feature = "unstable")]
 pub struct CreateMediaGalleryItem<'a> {
     media: CreateUnfurledMediaItem<'a>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -339,7 +322,6 @@ pub struct CreateMediaGalleryItem<'a> {
     spoiler: Option<bool>,
 }
 
-#[cfg(feature = "unstable")]
 impl<'a> CreateMediaGalleryItem<'a> {
     /// Create a new media gallery item.
     pub fn new(media: CreateUnfurledMediaItem<'a>) -> Self {
@@ -389,7 +371,6 @@ impl<'a> CreateMediaGalleryItem<'a> {
 /// refer to the [Discord Documentation](https://discord.com/developers/docs/reference#uploading-files).
 #[derive(Clone, Debug, Serialize)]
 #[must_use]
-#[cfg(feature = "unstable")]
 pub struct CreateFile<'a> {
     #[serde(rename = "type")]
     kind: StaticU8<13>,
@@ -398,7 +379,6 @@ pub struct CreateFile<'a> {
     spoiler: Option<bool>,
 }
 
-#[cfg(feature = "unstable")]
 impl<'a> CreateFile<'a> {
     /// Create a new builder for the file component. Refer to this builders documentation for
     /// limits.
@@ -427,7 +407,6 @@ impl<'a> CreateFile<'a> {
 /// A builder for creating a separator.
 #[derive(Clone, Debug, Serialize)]
 #[must_use]
-#[cfg(feature = "unstable")]
 pub struct CreateSeparator {
     #[serde(rename = "type")]
     kind: StaticU8<14>,
@@ -436,7 +415,6 @@ pub struct CreateSeparator {
     spacing: Option<Spacing>,
 }
 
-#[cfg(feature = "unstable")]
 impl CreateSeparator {
     /// Creates a new separator, with or without a divider.
     pub fn new(divider: bool) -> Self {
@@ -464,7 +442,6 @@ impl CreateSeparator {
 /// A builder to create a container, which acts similarly to embeds.
 #[derive(Clone, Debug, Serialize)]
 #[must_use]
-#[cfg(feature = "unstable")]
 pub struct CreateContainer<'a> {
     #[serde(rename = "type")]
     kind: StaticU8<17>,
@@ -475,7 +452,6 @@ pub struct CreateContainer<'a> {
     components: Cow<'a, [CreateComponent<'a>]>,
 }
 
-#[cfg(feature = "unstable")]
 impl<'a> CreateContainer<'a> {
     /// Create a new container, with an array of components inside. This component may contain any
     /// other component except another container!

src/builder/create_interaction_response.rs

@@ -1,12 +1,16 @@
 use std::borrow::Cow;
 use std::collections::HashMap;
 
-#[cfg(not(feature = "unstable"))]
-use super::CreateActionRow;
-#[cfg(feature = "unstable")]
-use super::CreateComponent;
 use super::create_poll::Ready;
-use super::{CreateAllowedMentions, CreateAttachment, CreateEmbed, CreatePoll, EditAttachments};
+use super::{
+    CreateActionRow,
+    CreateAllowedMentions,
+    CreateAttachment,
+    CreateComponent,
+    CreateEmbed,
+    CreatePoll,
+    EditAttachments,
+};
 #[cfg(feature = "http")]
 use crate::http::Http;
 use crate::internal::prelude::*;
@@ -157,12 +161,8 @@ pub struct CreateInteractionResponseMessage<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
     flags: Option<MessageFlags>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    #[cfg(feature = "unstable")]
     components: Option<Cow<'a, [CreateComponent<'a>]>>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    #[cfg(not(feature = "unstable"))]
-    components: Option<Cow<'a, [CreateActionRow<'a>]>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     poll: Option<CreatePoll<'a, Ready>>,
     attachments: EditAttachments<'a>,
 }
@@ -274,19 +274,11 @@ impl<'a> CreateInteractionResponseMessage<'a> {
     }
 
     /// Sets the components of this message.
-    #[cfg(feature = "unstable")]
     pub fn components(mut self, components: impl Into<Cow<'a, [CreateComponent<'a>]>>) -> Self {
         self.components = Some(components.into());
         self
     }
 
-    /// Sets the components of this message.
-    #[cfg(not(feature = "unstable"))]
-    pub fn components(mut self, components: impl Into<Cow<'a, [CreateActionRow<'a>]>>) -> Self {
-        self.components = Some(components.into());
-        self
-    }
-
     /// Adds a poll to the message. Only one poll can be added per message.
     ///
     /// See [`CreatePoll`] for more information on creating and configuring a poll.
@@ -432,10 +424,7 @@ impl<'a> CreateAutocompleteResponse<'a> {
 #[derive(Clone, Debug, Default, Serialize)]
 #[must_use]
 pub struct CreateModal<'a> {
-    #[cfg(not(feature = "unstable"))]
     components: Cow<'a, [CreateActionRow<'a>]>,
-    #[cfg(feature = "unstable")]
-    components: Cow<'a, [CreateComponent<'a>]>,
     custom_id: Cow<'a, str>,
     title: Cow<'a, str>,
 }
@@ -453,16 +442,6 @@ impl<'a> CreateModal<'a> {
     /// Sets the components of this message.
     ///
     /// Overwrites existing components.
-    #[cfg(feature = "unstable")]
-    pub fn components(mut self, components: impl Into<Cow<'a, [CreateComponent<'a>]>>) -> Self {
-        self.components = components.into();
-        self
-    }
-
-    /// Sets the components of this message.
-    ///
-    /// Overwrites existing components.
-    #[cfg(not(feature = "unstable"))]
     pub fn components(mut self, components: impl Into<Cow<'a, [CreateActionRow<'a>]>>) -> Self {
         self.components = components.into();
         self

src/builder/create_interaction_response_followup.rs

@@ -1,11 +1,14 @@
 use std::borrow::Cow;
 
-#[cfg(not(feature = "unstable"))]
-use super::CreateActionRow;
-#[cfg(feature = "unstable")]
-use super::CreateComponent;
 use super::create_poll::Ready;
-use super::{CreateAllowedMentions, CreateAttachment, CreateEmbed, CreatePoll, EditAttachments};
+use super::{
+    CreateAllowedMentions,
+    CreateAttachment,
+    CreateComponent,
+    CreateEmbed,
+    CreatePoll,
+    EditAttachments,
+};
 #[cfg(feature = "http")]
 use crate::http::Http;
 #[cfg(feature = "http")]
@@ -26,12 +29,8 @@ pub struct CreateInteractionResponseFollowup<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
     allowed_mentions: Option<CreateAllowedMentions<'a>>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    #[cfg(feature = "unstable")]
     components: Option<Cow<'a, [CreateComponent<'a>]>>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    #[cfg(not(feature = "unstable"))]
-    components: Option<Cow<'a, [CreateActionRow<'a>]>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     flags: Option<MessageFlags>,
     #[serde(skip_serializing_if = "Option::is_none")]
     poll: Option<CreatePoll<'a, Ready>>,
@@ -154,13 +153,6 @@ impl<'a> CreateInteractionResponseFollowup<'a> {
     }
 
     /// Sets the components of this message.
-    #[cfg(not(feature = "unstable"))]
-    pub fn components(mut self, components: impl Into<Cow<'a, [CreateActionRow<'a>]>>) -> Self {
-        self.components = Some(components.into());
-        self
-    }
-
-    #[cfg(feature = "unstable")]
     pub fn components(mut self, components: impl Into<Cow<'a, [CreateComponent<'a>]>>) -> Self {
         self.components = Some(components.into());
         self

src/builder/create_message.rs

@@ -1,11 +1,14 @@
 use std::borrow::Cow;
 
-#[cfg(not(feature = "unstable"))]
-use super::CreateActionRow;
-#[cfg(feature = "unstable")]
-use super::CreateComponent;
 use super::create_poll::Ready;
-use super::{CreateAllowedMentions, CreateAttachment, CreateEmbed, CreatePoll, EditAttachments};
+use super::{
+    CreateAllowedMentions,
+    CreateAttachment,
+    CreateComponent,
+    CreateEmbed,
+    CreatePoll,
+    EditAttachments,
+};
 #[cfg(feature = "http")]
 use crate::http::Http;
 #[cfg(feature = "http")]
@@ -60,11 +63,7 @@ pub struct CreateMessage<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
     message_reference: Option<MessageReference>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    #[cfg(feature = "unstable")]
     components: Option<Cow<'a, [CreateComponent<'a>]>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[cfg(not(feature = "unstable"))]
-    components: Option<Cow<'a, [CreateActionRow<'a>]>>,
     sticker_ids: Cow<'a, [StickerId]>,
     #[serde(skip_serializing_if = "Option::is_none")]
     flags: Option<MessageFlags>,
@@ -185,19 +184,11 @@ impl<'a> CreateMessage<'a> {
     }
 
     /// Sets the components of this message.
-    #[cfg(feature = "unstable")]
     pub fn components(mut self, components: impl Into<Cow<'a, [CreateComponent<'a>]>>) -> Self {
         self.components = Some(components.into());
         self
     }
 
-    /// Sets the components of this message.
-    #[cfg(not(feature = "unstable"))]
-    pub fn components(mut self, components: impl Into<Cow<'a, [CreateActionRow<'a>]>>) -> Self {
-        self.components = Some(components.into());
-        self
-    }
-
     super::button_and_select_menu_convenience_methods!(self.components);
 
     /// Sets the flags for the message.