Hide MustBeBool from public API

Signed-off-by: Jens Reidel <adrian@travitia.xyz>
twilight-rs · Sep 4, 2024 · 5192b81 · 5192b81
1 parent df1008d
commit 5192b81
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/twilight-model/src/gateway/payload/incoming/guild_create.rs b/twilight-model/src/gateway/payload/incoming/guild_create.rs
@@ -27,15 +27,15 @@ impl GuildCreate {
 mod tests {
     use serde_test::Token;
 
-    use crate::{guild::UnavailableGuild, id::Id, util::mustbe::MustBeBool};
+    use crate::{guild::UnavailableGuild, id::Id};
 
     use super::GuildCreate;
 
     #[test]
     fn unavailable_guild() {
         let expected = GuildCreate::Unavailable(UnavailableGuild {
             id: Id::new(1234),
-            unavailable: MustBeBool,
+            unavailable: true,
         });
 
         // Note: serde(untagged) makes the enum transparent which is

diff --git a/twilight-model/src/gateway/payload/incoming/ready.rs b/twilight-model/src/gateway/payload/incoming/ready.rs
@@ -25,7 +25,6 @@ mod tests {
         id::Id,
         oauth::{ApplicationFlags, PartialApplication},
         user::CurrentUser,
-        util::mustbe::MustBeBool,
     };
     use serde_test::Token;
 
@@ -35,11 +34,11 @@ mod tests {
         let guilds = vec![
             UnavailableGuild {
                 id: Id::new(1),
-                unavailable: MustBeBool,
+                unavailable: true,
             },
             UnavailableGuild {
                 id: Id::new(2),
-                unavailable: MustBeBool,
+                unavailable: true,
             },
         ];
 

diff --git a/twilight-model/src/guild/unavailable_guild.rs b/twilight-model/src/guild/unavailable_guild.rs
@@ -4,23 +4,44 @@ use crate::{
 };
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize)]
 pub struct UnavailableGuild {
     pub id: Id<GuildMarker>,
-    pub unavailable: MustBeBool<true>,
+    pub unavailable: bool,
+}
+
+impl<'de> Deserialize<'de> for UnavailableGuild {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        #[derive(Deserialize)]
+        #[serde(rename = "UnavailableGuild")] // Tests expect this struct name
+        struct UnavailableGuildIntermediate {
+            id: Id<GuildMarker>,
+            unavailable: MustBeBool<true>,
+        }
+
+        let intermediate = UnavailableGuildIntermediate::deserialize(deserializer)?;
+
+        Ok(Self {
+            id: intermediate.id,
+            unavailable: intermediate.unavailable.get(),
+        })
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use super::UnavailableGuild;
-    use crate::{id::Id, util::mustbe::MustBeBool};
+    use crate::id::Id;
     use serde_test::Token;
 
     #[test]
     fn unavailable_guild() {
         let value = UnavailableGuild {
             id: Id::new(1),
-            unavailable: MustBeBool,
+            unavailable: true,
         };
 
         serde_test::assert_tokens(

diff --git a/twilight-model/src/util/mod.rs b/twilight-model/src/util/mod.rs
@@ -3,7 +3,7 @@
 pub mod datetime;
 pub mod hex_color;
 pub mod image_hash;
-pub mod mustbe;
+pub(crate) mod mustbe;
 
 pub use self::{datetime::Timestamp, hex_color::HexColor, image_hash::ImageHash};