Make trait Debug

chorus-macros/src/lib.rs

@@ -104,7 +104,7 @@ pub fn composite_derive(input: TokenStream) -> TokenStream {
                 let ident = &input.ident;
                 let expanded = quote! {
                     #[async_trait::async_trait(?Send)]
-                    impl<T: Updateable + Clone> Composite<T> for #ident {
+                    impl<T: Updateable + Clone + Debug> Composite<T> for #ident {
                         async fn watch_whole(self, gateway: &GatewayHandle) -> Self {
                             Self {
                                 #(#field_exprs,)*

src/types/entities/channel.rs

@@ -5,6 +5,7 @@ use chrono::Utc;
 use serde::{Deserialize, Serialize};
 use serde_aux::prelude::deserialize_string_from_number;
 use serde_repr::{Deserialize_repr, Serialize_repr};
+use std::fmt::Debug;
 
 use crate::gateway::{GatewayHandle, Updateable};
 use crate::types::{

src/types/entities/emoji.rs

@@ -1,3 +1,4 @@
+use std::fmt::Debug;
 use std::sync::{Arc, RwLock};
 
 use chorus_macros::{Composite, Updateable};

src/types/entities/guild.rs

@@ -1,3 +1,4 @@
+use std::fmt::Debug;
 use std::sync::{Arc, RwLock};
 
 use chorus_macros::{observe_option_vec, observe_vec, Composite, Updateable};

src/types/entities/mod.rs

@@ -24,6 +24,7 @@ pub use webhook::*;
 
 use crate::gateway::{GatewayHandle, Updateable};
 use async_trait::async_trait;
+use std::fmt::Debug;
 use std::sync::{Arc, RwLock};
 
 mod application;
@@ -51,7 +52,7 @@ mod voice_state;
 mod webhook;
 
 #[async_trait(?Send)]
-pub trait Composite<T: Updateable + Clone> {
+pub trait Composite<T: Updateable + Clone + Debug> {
     async fn watch_whole(self, gateway: &GatewayHandle) -> Self;
 
     async fn option_observe_fn(
@@ -59,11 +60,12 @@ pub trait Composite<T: Updateable + Clone> {
         gateway: &GatewayHandle,
     ) -> Option<Arc<RwLock<T>>>
     where
-        T: Composite<T>,
+        T: Composite<T> + Debug,
     {
+        println!("Processed option value.");
         if let Some(value) = value {
             let value = value.clone();
-            Some(gateway.observe_and_get(value).await)
+            Some(gateway.observe(value).await)
         } else {
             None
         }
@@ -76,10 +78,11 @@ pub trait Composite<T: Updateable + Clone> {
     where
         T: Composite<T>,
     {
+        println!("Processed option vec value.");
         if let Some(value) = value {
             let mut vec = Vec::new();
             for component in value.into_iter() {
-                vec.push(gateway.observe_and_get(component).await);
+                vec.push(gateway.observe(component).await);
             }
             Some(vec)
         } else {
@@ -91,7 +94,8 @@ pub trait Composite<T: Updateable + Clone> {
     where
         T: Composite<T>,
     {
-        gateway.observe_and_get(value).await
+        println!("Processed value.");
+        gateway.observe(value).await
     }
 
     async fn vec_observe_fn(
@@ -101,9 +105,10 @@ pub trait Composite<T: Updateable + Clone> {
     where
         T: Composite<T>,
     {
+        println!("Processed vec value.");
         let mut vec = Vec::new();
         for component in value.into_iter() {
-            vec.push(gateway.observe_and_get(component).await);
+            vec.push(gateway.observe(component).await);
         }
         vec
     }

src/types/entities/role.rs

@@ -2,6 +2,7 @@ use bitflags::bitflags;
 use chorus_macros::{Composite, Updateable};
 use serde::{Deserialize, Serialize};
 use serde_aux::prelude::{deserialize_option_number_from_string, deserialize_string_from_number};
+use std::fmt::Debug;
 
 use crate::gateway::{GatewayHandle, Updateable};
 use crate::types::{utils::Snowflake, Composite};

src/types/entities/user.rs

@@ -2,6 +2,7 @@ use chorus_macros::{Composite, Updateable};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use serde_aux::prelude::deserialize_option_number_from_string;
+use std::fmt::Debug;
 
 use crate::gateway::{GatewayHandle, Updateable};
 use crate::types::{utils::Snowflake, Composite};

src/types/entities/voice_state.rs

@@ -3,6 +3,7 @@ use std::sync::{Arc, RwLock};
 use chorus_macros::{Composite, Updateable};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
+use std::fmt::Debug;
 
 use crate::gateway::{GatewayHandle, Updateable};
 use crate::types::{

src/types/entities/webhook.rs

@@ -1,3 +1,4 @@
+use std::fmt::Debug;
 use std::sync::{Arc, RwLock};
 
 use chorus_macros::{Composite, Updateable};

src/types/events/channel.rs

@@ -42,6 +42,9 @@ impl UpdateMessage<Channel> for ChannelUpdate {
     fn update(&mut self, object_to_update: Arc<RwLock<Channel>>) {
         let mut write = object_to_update.write().unwrap();
         *write = self.channel.clone();
+        drop(write);
+        println!("{:?}", self.channel.name);
+        assert_eq!(self.channel.name, object_to_update.read().unwrap().name);
     }
     fn id(&self) -> Snowflake {
         self.channel.id