exclude trivial id() functions from coverage

src/types/entities/voice_state.rs

@@ -47,6 +47,7 @@ pub struct VoiceState {
 }
 
 impl Updateable for VoiceState {
+    #[cfg(not(tarpaulin_include))]
     fn id(&self) -> Snowflake {
         if let Some(id) = self.id {
             id // ID exists: Only the case for Spacebar Server impls

src/types/events/auto_moderation.rs

@@ -31,7 +31,9 @@ pub struct AutoModerationRuleUpdate {
 }
 
 #[cfg(feature = "client")]
+#[cfg(not(tarpaulin_include))]
 impl UpdateMessage<AutoModerationRule> for AutoModerationRuleUpdate {
+    #[cfg(not(tarpaulin_include))]
     fn id(&self) -> Option<Snowflake> {
         Some(self.rule.id)
     }

src/types/events/channel.rs

@@ -39,6 +39,7 @@ impl WebSocketEvent for ChannelCreate {}
 
 #[cfg(feature = "client")]
 impl UpdateMessage<Guild> for ChannelCreate {
+    #[cfg(not(tarpaulin_include))]
     fn id(&self) -> Option<Snowflake> {
         self.channel.guild_id
     }
@@ -73,6 +74,8 @@ impl UpdateMessage<Channel> for ChannelUpdate {
         let mut write = object_to_update.write().unwrap();
         *write = self.channel.clone();
     }
+
+    #[cfg(not(tarpaulin_include))]
     fn id(&self) -> Option<Snowflake> {
         Some(self.channel.id)
     }
@@ -111,6 +114,7 @@ pub struct ChannelDelete {
 
 #[cfg(feature = "client")]
 impl UpdateMessage<Guild> for ChannelDelete {
+    #[cfg(not(tarpaulin_include))]
     fn id(&self) -> Option<Snowflake> {
         self.channel.guild_id
     }

src/types/events/guild.rs

@@ -30,7 +30,9 @@ pub struct GuildCreate {
 }
 
 #[cfg(feature = "client")]
+#[cfg(not(tarpaulin_include))]
 impl UpdateMessage<Guild> for GuildCreate {
+    #[cfg(not(tarpaulin_include))]
     fn id(&self) -> Option<Snowflake> {
         match &self.d {
             GuildCreateDataOption::UnavailableGuild(unavailable) => Some(unavailable.id),
@@ -92,6 +94,7 @@ impl WebSocketEvent for GuildUpdate {}
 
 #[cfg(feature = "client")]
 impl UpdateMessage<Guild> for GuildUpdate {
+    #[cfg(not(tarpaulin_include))]
     fn id(&self) -> Option<Snowflake> {
         Some(self.guild.id)
     }
@@ -111,6 +114,7 @@ pub struct GuildDelete {
 
 #[cfg(feature = "client")]
 impl UpdateMessage<Guild> for GuildDelete {
+    #[cfg(not(tarpaulin_include))]
     fn id(&self) -> Option<Snowflake> {
         Some(self.guild.id)
     }
@@ -225,6 +229,7 @@ impl WebSocketEvent for GuildRoleCreate {}
 
 #[cfg(feature = "client")]
 impl UpdateMessage<Guild> for GuildRoleCreate {
+    #[cfg(not(tarpaulin_include))]
     fn id(&self) -> Option<Snowflake> {
         Some(self.guild_id)
     }
@@ -258,6 +263,7 @@ impl WebSocketEvent for GuildRoleUpdate {}
 
 #[cfg(feature = "client")]
 impl UpdateMessage<RoleObject> for GuildRoleUpdate {
+    #[cfg(not(tarpaulin_include))]
     fn id(&self) -> Option<Snowflake> {
         Some(self.role.id)
     }

src/types/events/mod.rs

@@ -135,6 +135,7 @@ where
     fn update(&mut self, object_to_update: Shared<T>) {
         update_object(self.get_json(), object_to_update)
     }
+    #[cfg(not(tarpaulin_include))]
     fn id(&self) -> Option<Snowflake>;
 }
 

src/types/events/thread.rs

@@ -32,6 +32,7 @@ impl WebSocketEvent for ThreadUpdate {}
 
 #[cfg(feature = "client")]
 impl UpdateMessage<Channel> for ThreadUpdate {
+    #[cfg(not(tarpaulin_include))]
     fn id(&self) -> Option<Snowflake> {
         Some(self.thread.id)
     }

tests/gateway.rs

@@ -2,7 +2,10 @@ mod common;
 
 use chorus::errors::GatewayError;
 use chorus::gateway::*;
-use chorus::types::{self, ChannelModifySchema, IntoShared, RoleCreateModifySchema, RoleObject};
+use chorus::types::{
+    self, Channel, ChannelCreateSchema, ChannelModifySchema, IntoShared, RoleCreateModifySchema,
+    RoleObject,
+};
 #[cfg(target_arch = "wasm32")]
 use wasm_bindgen_test::*;
 #[cfg(target_arch = "wasm32")]
@@ -36,7 +39,10 @@ async fn test_gateway_authenticate() {
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
 #[cfg_attr(not(target_arch = "wasm32"), tokio::test)]
 async fn test_self_updating_structs() {
+    // PRETTYFYME: This test is a bit of a mess, but it works. Ideally, each self-updating struct
+    // would have its own test.
     let mut bundle = common::setup().await;
+
     let received_channel = bundle
         .user
         .gateway
@@ -64,6 +70,34 @@ async fn test_self_updating_structs() {
         "selfupdating".to_string()
     );
 
+    let guild = bundle
+        .user
+        .gateway
+        .observe_and_into_inner(bundle.guild.clone())
+        .await;
+    assert!(guild.channels.is_none());
+
+    Channel::create(
+        &mut bundle.user,
+        guild.id,
+        None,
+        ChannelCreateSchema {
+            name: "selfupdating2".to_string(),
+            channel_type: Some(types::ChannelType::GuildText),
+            ..Default::default()
+        },
+    )
+    .await
+    .unwrap();
+
+    let guild = bundle
+        .user
+        .gateway
+        .observe_and_into_inner(guild.into_shared())
+        .await;
+    assert!(guild.channels.is_some());
+    assert!(guild.channels.as_ref().unwrap().len() == 1);
+
     common::teardown(bundle).await
 }
 

tests/ratelimit.rs

@@ -1,28 +1,7 @@
-use chorus::errors::ChorusError;
 use chorus::ratelimiter::ChorusRequest;
 
 mod common;
 
-#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
-#[cfg_attr(not(target_arch = "wasm32"), tokio::test)]
-async fn hit_ratelimit() {
-    let mut bundle = common::setup().await;
-    let mut _count = 0;
-    let guild = bundle.guild.read().unwrap().clone();
-    while _count < 1000 {
-        _count += 1;
-        match guild.channels(&mut bundle.user).await {
-            Err(ChorusError::RateLimited { bucket: _ }) => {
-                return;
-            }
-            Err(_) => panic!("Hit different rate limit"),
-            _ => continue,
-        }
-    }
-    common::teardown(bundle).await;
-    panic!("Ratelimit never triggered");
-}
-
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
 #[cfg_attr(not(target_arch = "wasm32"), tokio::test)]
 async fn get_limit_config() {