Reformat entire project, optimize imports

src/api/auth/login.rs

@@ -1,4 +1,3 @@
-pub mod login {
 use std::cell::RefCell;
 use std::rc::Rc;
 
@@ -69,4 +68,3 @@ pub mod login {
         Ok(user)
     }
 }
-}

src/api/auth/mod.rs

@@ -1,5 +1,6 @@
+pub use login::*;
+pub use register::*;
+
 pub mod login;
 pub mod register;
 
-pub use login::*;
-pub use register::*;

src/api/auth/register.rs

@@ -1,4 +1,3 @@
-pub mod register {
 use std::{cell::RefCell, rc::Rc};
 
 use reqwest::Client;
@@ -76,4 +75,3 @@ pub mod register {
         Ok(user)
     }
 }
-}

src/api/channels/messages.rs

@@ -1,6 +1,6 @@
 use http::header::CONTENT_DISPOSITION;
 use http::HeaderMap;
-use reqwest::{multipart, Client};
+use reqwest::{Client, multipart};
 use serde_json::to_string;
 
 use crate::instance::UserMeta;

src/api/channels/mod.rs

@@ -1,9 +1,10 @@
+pub use channels::*;
+pub use messages::*;
+pub use permissions::*;
+pub use reactions::*;
+
 pub mod channels;
 pub mod messages;
 pub mod permissions;
 pub mod reactions;
 
-pub use channels::*;
-pub use messages::*;
-pub use permissions::*;
-pub use reactions::*;

src/api/guilds/guilds.rs

@@ -173,7 +173,7 @@ impl Guild {
             Err(e) => {
                 return Err(ChorusLibError::InvalidResponseError {
                     error: e.to_string(),
-                })
+                });
             }
         };
         let _: Vec<Channel> = match from_str(&stringed_response) {
@@ -181,7 +181,7 @@ impl Guild {
             Err(e) => {
                 return Err(ChorusLibError::InvalidResponseError {
                     error: e.to_string(),
-                })
+                });
             }
         };
     }

src/api/guilds/member.rs

@@ -43,7 +43,7 @@ impl types::GuildMember {
             Err(e) => {
                 return Err(ChorusLibError::InvalidResponseError {
                     error: e.to_string(),
-                })
+                });
             }
         };
         let member = from_str::<types::GuildMember>(&response_text);

src/api/guilds/mod.rs

@@ -1,7 +1,7 @@
-pub mod guilds;
-pub mod member;
-pub mod roles;
-
 pub use guilds::*;
 pub use roles::*;
 pub use roles::*;
+
+pub mod guilds;
+pub mod member;
+pub mod roles;

src/api/guilds/roles.rs

@@ -48,7 +48,7 @@ impl types::RoleObject {
             Err(e) => {
                 return Err(ChorusLibError::InvalidResponseError {
                     error: e.to_string(),
-                })
+                });
             }
         };
 
@@ -105,7 +105,7 @@ impl types::RoleObject {
             Err(e) => {
                 return Err(ChorusLibError::InvalidResponseError {
                     error: e.to_string(),
-                })
+                });
             }
         };
 
@@ -139,7 +139,7 @@ impl types::RoleObject {
             Err(e) => {
                 return Err(ChorusLibError::FormCreationError {
                     error: e.to_string(),
-                })
+                });
             }
         };
         let request = Client::new().post(url).bearer_auth(user.token()).body(body);
@@ -161,7 +161,7 @@ impl types::RoleObject {
             Err(e) => {
                 return Err(ChorusLibError::InvalidResponseError {
                     error: e.to_string(),
-                })
+                });
             }
         };
         Ok(role)
@@ -194,7 +194,7 @@ impl types::RoleObject {
             Err(e) => {
                 return Err(ChorusLibError::FormCreationError {
                     error: e.to_string(),
-                })
+                });
             }
         };
         let request = Client::new()
@@ -216,7 +216,7 @@ impl types::RoleObject {
             Err(e) => {
                 return Err(ChorusLibError::InvalidResponseError {
                     error: e.to_string(),
-                })
+                });
             }
         };
         Ok(role)
@@ -256,7 +256,7 @@ impl types::RoleObject {
             Err(e) => {
                 return Err(ChorusLibError::FormCreationError {
                     error: e.to_string(),
-                })
+                });
             }
         };
         let request = Client::new()
@@ -281,7 +281,7 @@ impl types::RoleObject {
             Err(e) => {
                 return Err(ChorusLibError::InvalidResponseError {
                     error: e.to_string(),
-                })
+                });
             }
         };
         Ok(role)

src/api/mod.rs

@@ -1,10 +1,11 @@
+pub use channels::messages::*;
+pub use guilds::*;
+pub use policies::instance::instance::*;
+pub use policies::instance::limits::*;
+
 pub mod auth;
 pub mod channels;
 pub mod guilds;
 pub mod policies;
 pub mod users;
 
-pub use channels::messages::*;
-pub use guilds::*;
-pub use policies::instance::instance::*;
-pub use policies::instance::limits::*;

src/api/policies/instance/limits.rs

@@ -47,7 +47,6 @@ pub mod limits {
 
     #[derive(Debug, Deserialize, Serialize)]
     #[allow(non_snake_case)]
-
     pub struct Guild {
         pub maxRoles: u64,
         pub maxEmojis: u64,
@@ -58,7 +57,6 @@ pub mod limits {
 
     #[derive(Debug, Deserialize, Serialize)]
     #[allow(non_snake_case)]
-
     pub struct Message {
         pub maxCharacters: u64,
         pub maxTTSCharacters: u64,
@@ -70,7 +68,6 @@ pub mod limits {
 
     #[derive(Debug, Deserialize, Serialize)]
     #[allow(non_snake_case)]
-
     pub struct Channel {
         pub maxPins: u64,
         pub maxTopic: u64,
@@ -102,7 +99,6 @@ pub mod limits {
 
     #[derive(Debug, Deserialize, Serialize)]
     #[allow(non_snake_case)]
-
     pub struct AuthRoutes {
         pub login: Window,
         pub register: Window,
@@ -110,7 +106,6 @@ pub mod limits {
 
     #[derive(Debug, Deserialize, Serialize)]
     #[allow(non_snake_case)]
-
     pub struct AbsoluteRate {
         pub register: AbsoluteWindow,
         pub sendMessage: AbsoluteWindow,
@@ -125,7 +120,6 @@ pub mod limits {
 
     #[derive(Debug, Deserialize, Serialize)]
     #[allow(non_snake_case)]
-
     pub struct Config {
         pub user: User,
         pub guild: Guild,

src/api/policies/instance/mod.rs

@@ -1,5 +1,6 @@
+pub use instance::*;
+pub use limits::*;
+
 pub mod instance;
 pub mod limits;
 
-pub use instance::*;
-pub use limits::*;

src/api/policies/mod.rs

@@ -1,3 +1,4 @@
+pub use instance::limits::*;
+
 pub mod instance;
 
-pub use instance::limits::*;

src/api/users/mod.rs

@@ -1,3 +1,4 @@
+pub use users::*;
+
 pub mod users;
 
-pub use users::*;

src/gateway.rs

@@ -1,11 +1,9 @@
-use crate::errors::ObserverError;
-use crate::gateway::events::Events;
-use crate::types;
-use futures_util::stream::SplitSink;
+use std::sync::Arc;
+
 use futures_util::SinkExt;
+use futures_util::stream::SplitSink;
 use futures_util::StreamExt;
 use native_tls::TlsConnector;
-use std::sync::Arc;
 use tokio::net::TcpStream;
 use tokio::sync::mpsc;
 use tokio::sync::mpsc::error::TryRecvError;
@@ -15,8 +13,12 @@ use tokio::task;
 use tokio::task::JoinHandle;
 use tokio::time;
 use tokio::time::Instant;
-use tokio_tungstenite::MaybeTlsStream;
 use tokio_tungstenite::{connect_async_tls_with_config, Connector, WebSocketStream};
+use tokio_tungstenite::MaybeTlsStream;
+
+use crate::errors::ObserverError;
+use crate::gateway::events::Events;
+use crate::types;
 
 // Gateway opcodes
 /// Opcode received when the server dispatches a [crate::types::WebSocketEvent]
@@ -1288,7 +1290,6 @@ pub trait Observer<T: types::WebSocketEvent>: std::fmt::Debug {
 /** GatewayEvent is a wrapper around a WebSocketEvent. It is used to notify the observers of a
 change in the WebSocketEvent. GatewayEvents are observable.
  */
-
 #[derive(Default, Debug)]
 pub struct GatewayEvent<T: types::WebSocketEvent> {
     observers: Vec<Arc<Mutex<dyn Observer<T> + Sync + Send>>>,
@@ -1364,6 +1365,7 @@ impl<T: types::WebSocketEvent> GatewayEvent<T> {
 
 mod events {
     use super::*;
+
     #[derive(Default, Debug)]
     pub struct Events {
         pub application: Application,
@@ -1528,6 +1530,7 @@ mod example {
 
     #[derive(Debug)]
     struct Consumer;
+
     impl Observer<types::GatewayResume> for Consumer {
         fn update(&self, data: &types::GatewayResume) {
             println!("{}", data.token)

src/instance.rs

@@ -1,3 +1,7 @@
+use std::cell::RefCell;
+use std::fmt;
+use std::rc::Rc;
+
 use serde::{Deserialize, Serialize};
 
 use crate::api::limits::Limits;
@@ -5,10 +9,6 @@ use crate::errors::{ChorusLibError, FieldFormatError};
 use crate::types::{GeneralConfiguration, User, UserSettings};
 use crate::URLBundle;
 
-use std::cell::RefCell;
-use std::fmt;
-use std::rc::Rc;
-
 #[derive(Debug, Clone)]
 /**
 The [`Instance`] what you will be using to perform all sorts of actions on the Spacebar server.
@@ -47,7 +47,7 @@ impl Instance {
             Err(e) => {
                 return Err(ChorusLibError::CantGetInfoError {
                     error: e.to_string(),
-                })
+                });
             }
         };
         Ok(instance)

src/lib.rs

@@ -1,3 +1,5 @@
+use url::{ParseError, Url};
+
 #[cfg(feature = "client")]
 pub mod api;
 pub mod errors;
@@ -11,9 +13,7 @@ pub mod types;
 #[cfg(feature = "client")]
 pub mod voice;
 
-use url::{ParseError, Url};
 #[derive(Clone, Default, Debug, PartialEq, Eq)]
-
 /// A URLBundle is a struct which bundles together the API-, Gateway- and CDN-URLs of a Spacebar
 /// instance.
 pub struct URLBundle {

src/limit.rs

@@ -1,10 +1,11 @@
-use crate::{
-    api::limits::{Limit, LimitType, Limits, LimitsMutRef},
-    errors::ChorusLibError,
-};
+use std::collections::VecDeque;
 
 use reqwest::{Client, RequestBuilder, Response};
-use std::collections::VecDeque;
+
+use crate::{
+    api::limits::{Limit, Limits, LimitsMutRef, LimitType},
+    errors::ChorusLibError,
+};
 
 // Note: There seem to be some overlapping request limiters. We need to make sure that sending a
 // request checks for all the request limiters that apply, and blocks if any of the limiters are 0
@@ -79,7 +80,7 @@ impl LimitedRequester {
                     return Err(ChorusLibError::RequestErrorError {
                         url: "".to_string(),
                         error: e.to_string(),
-                    })
+                    });
                 }
             };
             let result = self.http.execute(built_request).await;
@@ -88,7 +89,7 @@ impl LimitedRequester {
                 Err(e) => {
                     return Err(ChorusLibError::ReceivedErrorCodeError {
                         error_code: e.to_string(),
-                    })
+                    });
                 }
             };
             self.update_limits(
@@ -104,7 +105,7 @@ impl LimitedRequester {
                     _ => {
                         return Err(ChorusLibError::ReceivedErrorCodeError {
                             error_code: response.status().as_str().to_string(),
-                        })
+                        });
                     }
                 }
             } else {
@@ -281,10 +282,11 @@ impl LimitedRequester {
 mod rate_limit {
     use serde_json::from_str;
 
-    use super::*;
     use crate::{api::limits::Config, URLBundle};
-    #[tokio::test]
 
+    use super::*;
+
+    #[tokio::test]
     async fn create_limited_requester() {
         let _urls = URLBundle::new(
             String::from("http://localhost:3001/api/"),

src/types/config/mod.rs

@@ -172,7 +172,7 @@ fn insert_into(value: &mut Value, path: &[&str], new_value: Value) {
 
 #[cfg(test)]
 mod test {
-    use crate::types::config::{generate_pairs, pairs_to_config, ConfigValue};
+    use crate::types::config::{ConfigValue, generate_pairs, pairs_to_config};
 
     #[test]
     fn test_pairs() {

src/types/config/types/guild_configuration.rs

@@ -1,20 +1,21 @@
-use serde::{Deserialize, Serialize};
-#[cfg(feature = "sqlx")]
-use sqlx::{
-    database::{HasArguments, HasValueRef},
-    encode::IsNull,
-    error::BoxDynError,
-    Decode, Encode, MySql,
-};
 use std::fmt::{Display, Formatter};
 use std::io::Write;
 use std::ops::{Deref, DerefMut};
 use std::str::FromStr;
 
+use serde::{Deserialize, Serialize};
+#[cfg(feature = "sqlx")]
+use sqlx::{
+    database::{HasArguments, HasValueRef},
+    Decode,
+    Encode,
+    encode::IsNull, error::BoxDynError, MySql,
+};
+
+use crate::types::{Error, GuildError};
 use crate::types::config::types::subconfigs::guild::{
     autojoin::AutoJoinConfiguration, discovery::DiscoverConfiguration,
 };
-use crate::types::{Error, GuildError};
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Serialize, Deserialize)]
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]

src/types/config/types/subconfigs/limits/rates.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 use crate::types::config::types::subconfigs::limits::ratelimits::{
-    route::RouteRateLimit, RateLimitOptions,
+    RateLimitOptions, route::RouteRateLimit,
 };
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]

src/types/config/types/subconfigs/register/email.rs

@@ -9,6 +9,7 @@ pub struct RegistrationEmailConfiguration {
     #[serde(default)]
     pub domains: Vec<String>,
 }
+
 impl Default for RegistrationEmailConfiguration {
     fn default() -> Self {
         Self {

src/types/config/types/subconfigs/register/mod.rs

@@ -1,7 +1,8 @@
+pub use date_of_birth::DateOfBirthConfiguration;
+pub use email::RegistrationEmailConfiguration;
+pub use password::PasswordConfiguration;
+
 mod date_of_birth;
 mod email;
 mod password;
 
-pub use date_of_birth::DateOfBirthConfiguration;
-pub use email::RegistrationEmailConfiguration;
-pub use password::PasswordConfiguration;

src/types/config/types/subconfigs/security/mod.rs

@@ -1,5 +1,6 @@
+pub use captcha::{CaptchaConfiguration, CaptchaService};
+pub use twofactor::TwoFactorConfiguration;
+
 mod captcha;
 mod twofactor;
 
-pub use captcha::{CaptchaConfiguration, CaptchaService};
-pub use twofactor::TwoFactorConfiguration;

src/types/entities/application.rs

@@ -1,10 +1,11 @@
-use crate::types::utils::Snowflake;
-use crate::types::{Team, User};
 use bitflags::{bitflags, Flags};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use serde_repr::{Deserialize_repr, Serialize_repr};
 
+use crate::types::{Team, User};
+use crate::types::utils::Snowflake;
+
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]
 pub struct Application {

src/types/entities/attachment.rs

@@ -23,7 +23,6 @@ pub struct Attachment {
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
-
 pub struct PartialDiscordFileAttachment {
     pub id: Option<i16>,
     pub filename: String,

src/types/entities/guild.rs

@@ -2,12 +2,12 @@ use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use serde_repr::{Deserialize_repr, Serialize_repr};
 
-use crate::types::types::guild_configuration::GuildFeaturesList;
 use crate::types::{
     entities::{Channel, Emoji, RoleObject, Sticker, User, VoiceState, Webhook},
     interfaces::WelcomeScreenObject,
     utils::Snowflake,
 };
+use crate::types::types::guild_configuration::GuildFeaturesList;
 
 /// See https://discord.com/developers/docs/resources/guild
 #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]

src/types/entities/message.rs

@@ -170,7 +170,6 @@ pub struct EmbedAuthor {
 }
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
-
 pub struct EmbedField {
     name: String,
     value: String,

src/types/entities/mod.rs

@@ -1,3 +1,26 @@
+pub use application::*;
+pub use attachment::*;
+pub use audit_log::*;
+pub use auto_moderation::*;
+pub use channel::*;
+pub use config::*;
+pub use emoji::*;
+pub use guild::*;
+pub use guild_member::*;
+pub use integration::*;
+pub use message::*;
+pub use relationship::*;
+pub use role::*;
+pub use security_key::*;
+pub use stage_instance::*;
+pub use sticker::*;
+pub use team::*;
+pub use template::*;
+pub use user::*;
+pub use user_settings::*;
+pub use voice_state::*;
+pub use webhook::*;
+
 mod application;
 mod attachment;
 mod audit_log;
@@ -21,25 +44,3 @@ mod user_settings;
 mod voice_state;
 mod webhook;
 
-pub use application::*;
-pub use attachment::*;
-pub use audit_log::*;
-pub use auto_moderation::*;
-pub use channel::*;
-pub use config::*;
-pub use emoji::*;
-pub use guild::*;
-pub use guild_member::*;
-pub use integration::*;
-pub use message::*;
-pub use relationship::*;
-pub use role::*;
-pub use security_key::*;
-pub use stage_instance::*;
-pub use sticker::*;
-pub use team::*;
-pub use template::*;
-pub use user::*;
-pub use user_settings::*;
-pub use voice_state::*;
-pub use webhook::*;

src/types/entities/template.rs

@@ -21,7 +21,8 @@ pub struct GuildTemplate {
     pub updated_at: DateTime<Utc>,
     pub source_guild_id: String,
     #[cfg_attr(feature = "sqlx", sqlx(skip))]
-    pub source_guild: Vec<Guild>, // Unsure how a {recursive: Guild} looks like, might be a Vec?
+    pub source_guild: Vec<Guild>,
+    // Unsure how a {recursive: Guild} looks like, might be a Vec?
     #[cfg_attr(feature = "sqlx", sqlx(skip))]
     pub serialized_source_guild: Vec<Guild>,
 }

src/types/events/call.rs

@@ -10,12 +10,14 @@ pub struct CallCreate {
     pub voice_states: Vec<VoiceState>,
     /// Seems like a vec of channel ids
     pub ringing: Vec<String>,
-    pub region: String, // milan
+    pub region: String,
+    // milan
     pub message_id: String,
     /// What is this?
     pub embedded_activities: Vec<serde_json::Value>,
     pub channel_id: String,
 }
+
 impl WebSocketEvent for CallCreate {}
 
 #[derive(Debug, Deserialize, Serialize, Default)]
@@ -25,11 +27,13 @@ impl WebSocketEvent for CallCreate {}
 pub struct CallUpdate {
     /// Seems like a vec of channel ids
     pub ringing: Vec<String>,
-    pub region: String, // milan
+    pub region: String,
+    // milan
     pub message_id: String,
     pub guild_id: Option<String>,
     pub channel_id: String,
 }
+
 impl WebSocketEvent for CallUpdate {}
 
 #[derive(Debug, Deserialize, Serialize, Default)]
@@ -39,6 +43,7 @@ impl WebSocketEvent for CallUpdate {}
 pub struct CallDelete {
     pub channel_id: String,
 }
+
 impl WebSocketEvent for CallDelete {}
 
 #[derive(Debug, Deserialize, Serialize, Default)]
@@ -48,4 +53,5 @@ impl WebSocketEvent for CallDelete {}
 pub struct CallSync {
     pub channel_id: String,
 }
+
 impl WebSocketEvent for CallSync {}

src/types/events/channel.rs

@@ -1,8 +1,9 @@
-use crate::types::entities::Channel;
-use crate::types::events::WebSocketEvent;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
+use crate::types::entities::Channel;
+use crate::types::events::WebSocketEvent;
+
 #[derive(Debug, Default, Deserialize, Serialize)]
 /// See https://discord.com/developers/docs/topics/gateway-events#channel-pins-update
 pub struct ChannelPinsUpdate {

src/types/events/guild.rs

@@ -1,9 +1,10 @@
-use crate::types::entities::{Guild, PublicUser, UnavailableGuild};
-use crate::types::events::WebSocketEvent;
-use crate::types::{AuditLogEntry, Emoji, GuildMember, GuildScheduledEvent, RoleObject, Sticker};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
+use crate::types::{AuditLogEntry, Emoji, GuildMember, GuildScheduledEvent, RoleObject, Sticker};
+use crate::types::entities::{Guild, PublicUser, UnavailableGuild};
+use crate::types::events::WebSocketEvent;
+
 use super::PresenceUpdate;
 
 #[derive(Debug, Deserialize, Serialize, Default)]
@@ -26,6 +27,7 @@ impl Default for GuildCreateDataOption {
         GuildCreateDataOption::UnavailableGuild(UnavailableGuild::default())
     }
 }
+
 impl WebSocketEvent for GuildCreate {}
 
 #[derive(Debug, Default, Deserialize, Serialize)]

src/types/events/heartbeat.rs

@@ -1,6 +1,7 @@
-use crate::types::events::WebSocketEvent;
 use serde::{Deserialize, Serialize};
 
+use crate::types::events::WebSocketEvent;
+
 #[derive(Debug, Default, Deserialize, Serialize)]
 pub struct GatewayHeartbeat {
     pub op: u8,

src/types/events/hello.rs

@@ -1,6 +1,7 @@
-use crate::types::events::WebSocketEvent;
 use serde::{Deserialize, Serialize};
 
+use crate::types::events::WebSocketEvent;
+
 #[derive(Debug, Default, Deserialize, Serialize)]
 pub struct GatewayHello {
     pub op: i32,

src/types/events/identify.rs

@@ -1,7 +1,8 @@
-use crate::types::events::{PresenceUpdate, WebSocketEvent};
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 
+use crate::types::events::{PresenceUpdate, WebSocketEvent};
+
 #[derive(Debug, Deserialize, Serialize)]
 pub struct GatewayIdentifyPayload {
     pub token: String,
@@ -9,7 +10,8 @@ pub struct GatewayIdentifyPayload {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub compress: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub large_threshold: Option<i16>, //default: 50
+    pub large_threshold: Option<i16>,
+    //default: 50
     #[serde(skip_serializing_if = "Option::is_none")]
     pub shard: Option<Vec<(i32, i32)>>,
     #[serde(skip_serializing_if = "Option::is_none")]

src/types/events/lazy_request.rs

@@ -24,4 +24,5 @@ pub struct LazyRequest {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub channels: Option<HashMap<String, Vec<Vec<u64>>>>,
 }
+
 impl WebSocketEvent for LazyRequest {}

src/types/events/message.rs

@@ -126,4 +126,5 @@ pub struct MessageACK {
     pub flags: Option<serde_json::Value>,
     pub channel_id: String,
 }
+
 impl WebSocketEvent for MessageACK {}

src/types/events/mod.rs

@@ -1,31 +1,5 @@
 use serde::{Deserialize, Serialize};
 
-mod application;
-mod auto_moderation;
-mod call;
-mod channel;
-mod guild;
-mod heartbeat;
-mod hello;
-mod identify;
-mod integration;
-mod interaction;
-mod invite;
-mod lazy_request;
-mod message;
-mod passive_update;
-mod presence;
-mod ready;
-mod relationship;
-mod request_members;
-mod resume;
-mod session;
-mod stage_instance;
-mod thread;
-mod user;
-mod voice;
-mod webhooks;
-
 pub use application::*;
 pub use auto_moderation::*;
 pub use call::*;
@@ -52,6 +26,32 @@ pub use user::*;
 pub use voice::*;
 pub use webhooks::*;
 
+mod application;
+mod auto_moderation;
+mod call;
+mod channel;
+mod guild;
+mod heartbeat;
+mod hello;
+mod identify;
+mod integration;
+mod interaction;
+mod invite;
+mod lazy_request;
+mod message;
+mod passive_update;
+mod presence;
+mod ready;
+mod relationship;
+mod request_members;
+mod resume;
+mod session;
+mod stage_instance;
+mod thread;
+mod user;
+mod voice;
+mod webhooks;
+
 pub trait WebSocketEvent {}
 
 #[derive(Debug, Default, Serialize, Clone)]
@@ -79,7 +79,6 @@ impl WebSocketEvent for GatewaySendPayload {}
 ///
 /// Similar to [GatewaySendPayload], except we send a [Value] for d whilst we receive a [serde_json::value::RawValue]
 /// Also, we never need to sent the event name
-
 pub struct GatewayReceivePayload<'a> {
     #[serde(rename = "op")]
     pub op_code: u8,

src/types/events/passive_update.rs

@@ -1,8 +1,9 @@
 use serde::{Deserialize, Serialize};
 
-use super::{ChannelUnreadUpdateObject, WebSocketEvent};
 use crate::types::{GuildMember, VoiceState};
 
+use super::{ChannelUnreadUpdateObject, WebSocketEvent};
+
 #[derive(Debug, Deserialize, Serialize, Default)]
 /// Officially Undocumented
 ///

src/types/events/presence.rs

@@ -1,7 +1,8 @@
+use serde::{Deserialize, Serialize};
+
 use crate::types::events::WebSocketEvent;
 use crate::types::interfaces::Activity;
 use crate::types::PublicUser;
-use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Deserialize, Serialize, Default, Clone)]
 /// See https://discord.com/developers/docs/topics/gateway-events#presence-update-presence-update-event-fields

src/types/events/ready.rs

@@ -1,8 +1,9 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{Activity, GuildMember, PresenceUpdate, VoiceState};
 use crate::types::entities::{Guild, User};
 use crate::types::events::{Session, WebSocketEvent};
 use crate::types::interfaces::ClientStatusObject;
-use crate::types::{Activity, GuildMember, PresenceUpdate, VoiceState};
-use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Deserialize, Serialize, Default)]
 /// Sort of documented, though most fields are left out

src/types/events/relationship.rs

@@ -1,6 +1,7 @@
-use crate::types::{events::WebSocketEvent, Relationship, RelationshipType, Snowflake};
 use serde::{Deserialize, Serialize};
 
+use crate::types::{events::WebSocketEvent, Relationship, RelationshipType, Snowflake};
+
 #[derive(Debug, Deserialize, Serialize, Default)]
 /// See https://github.com/spacebarchat/server/issues/204
 pub struct RelationshipAdd {

src/types/events/request_members.rs

@@ -1,6 +1,7 @@
-use crate::types::events::WebSocketEvent;
 use serde::{Deserialize, Serialize};
 
+use crate::types::events::WebSocketEvent;
+
 #[derive(Debug, Deserialize, Serialize, Default)]
 /// See https://discord.com/developers/docs/topics/gateway-events#request-guild-members-request-guild-members-structure
 pub struct GatewayRequestGuildMembers {

src/types/events/resume.rs

@@ -1,6 +1,7 @@
-use crate::types::events::WebSocketEvent;
 use serde::{Deserialize, Serialize};
 
+use crate::types::events::WebSocketEvent;
+
 #[derive(Debug, Deserialize, Serialize, Default)]
 pub struct GatewayResume {
     pub token: String,

src/types/events/thread.rs

@@ -1,6 +1,7 @@
+use serde::{Deserialize, Serialize};
+
 use crate::types::entities::{Channel, ThreadMember};
 use crate::types::events::WebSocketEvent;
-use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Default, Deserialize, Serialize)]
 /// See https://discord.com/developers/docs/topics/gateway-events#thread-create

src/types/events/user.rs

@@ -1,7 +1,8 @@
+use serde::{Deserialize, Serialize};
+
 use crate::types::entities::PublicUser;
 use crate::types::events::WebSocketEvent;
 use crate::types::utils::Snowflake;
-use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Default, Deserialize, Serialize)]
 /// See https://discord.com/developers/docs/topics/gateway-events#user-update

src/types/events/voice.rs

@@ -1,6 +1,7 @@
-use crate::types::{events::WebSocketEvent, VoiceState};
 use serde::{Deserialize, Serialize};
 
+use crate::types::{events::WebSocketEvent, VoiceState};
+
 #[derive(Debug, Deserialize, Serialize, Default)]
 /// See https://discord.com/developers/docs/topics/gateway-events#update-voice-state
 ///

src/types/interfaces/activity.rs

@@ -1,6 +1,7 @@
-use crate::types::entities::Emoji;
 use serde::{Deserialize, Serialize};
 
+use crate::types::entities::Emoji;
+
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct Activity {
     name: String,

src/types/interfaces/guild_welcome_screen.rs

@@ -1,6 +1,7 @@
-use crate::types::utils::Snowflake;
 use serde::{Deserialize, Serialize};
 
+use crate::types::utils::Snowflake;
+
 #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
 pub struct WelcomeScreenObject {
     pub enabled: bool,

src/types/interfaces/interaction.rs

@@ -1,8 +1,9 @@
-use crate::types::entities::{AllowedMention, Embed};
-use crate::types::utils::Snowflake;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
+use crate::types::entities::{AllowedMention, Embed};
+use crate::types::utils::Snowflake;
+
 #[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Interaction {
     pub id: Snowflake,

src/types/interfaces/mod.rs

@@ -1,11 +1,12 @@
+pub use activity::*;
+pub use connected_account::*;
+pub use guild_welcome_screen::*;
+pub use interaction::*;
+pub use status::*;
+
 mod activity;
 mod connected_account;
 mod guild_welcome_screen;
 mod interaction;
 mod status;
 
-pub use activity::*;
-pub use connected_account::*;
-pub use guild_welcome_screen::*;
-pub use interaction::*;
-pub use status::*;

src/types/schema/auth.rs

@@ -1,7 +1,8 @@
-use crate::errors::FieldFormatError;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 
+use crate::errors::FieldFormatError;
+
 /**
 A struct that represents a well-formed email address.
  */
@@ -100,7 +101,6 @@ You will receive a [`FieldFormatError`], if:
 - The username is not between 2 and 32 characters.
 - The password is not between 1 and 72 characters.
  */
-
 #[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub struct RegisterSchema {

src/types/schema/guild.rs

@@ -1,6 +1,7 @@
-use crate::types::entities::Channel;
 use serde::{Deserialize, Serialize};
 
+use crate::types::entities::Channel;
+
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "snake_case")]
 /// Represents the schema which needs to be sent to create a Guild.

src/types/schema/message.rs

@@ -1,7 +1,8 @@
+use serde::{Deserialize, Serialize};
+
 use crate::types::entities::{
     AllowedMention, Component, Embed, MessageReference, PartialDiscordFileAttachment,
 };
-use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "snake_case")]

src/types/schema/mod.rs

@@ -1,11 +1,3 @@
-mod apierror;
-mod auth;
-mod channel;
-mod guild;
-mod message;
-mod role;
-mod user;
-
 pub use apierror::*;
 pub use auth::*;
 pub use channel::*;
@@ -14,11 +6,20 @@ pub use message::*;
 pub use role::*;
 pub use user::*;
 
+mod apierror;
+mod auth;
+mod channel;
+mod guild;
+mod message;
+mod role;
+mod user;
+
 #[cfg(test)]
 mod schemas_tests {
-    use super::*;
     use crate::errors::FieldFormatError;
 
+    use super::*;
+
     #[test]
     fn password_too_short() {
         assert_eq!(

src/types/schema/role.rs

@@ -1,6 +1,7 @@
-use crate::types::Snowflake;
 use serde::{Deserialize, Serialize};
 
+use crate::types::Snowflake;
+
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "snake_case")]
 /// Represents the schema which needs to be sent to create or modify a Role.

src/types/utils/mod.rs

@@ -1,8 +1,9 @@
+pub use regexes::*;
+pub use rights::Rights;
+pub use snowflake::{DeconstructedSnowflake, Snowflake};
+
 pub mod jwt;
 mod regexes;
 mod rights;
 mod snowflake;
 
-pub use regexes::*;
-pub use rights::Rights;
-pub use snowflake::{DeconstructedSnowflake, Snowflake};

tests/auth.rs

@@ -1,6 +1,7 @@
-mod common;
 use chorus::types;
 
+mod common;
+
 #[tokio::test]
 async fn test_registration() {
     let mut bundle = common::setup().await;

tests/channel.rs

@@ -1,6 +1,7 @@
-mod common;
 use chorus::types::{self, Channel, PermissionFlags, PermissionOverwrite};
 
+mod common;
+
 #[tokio::test]
 async fn get_channel() {
     let mut bundle = common::setup().await;
@@ -9,7 +10,7 @@ async fn get_channel() {
 
     assert_eq!(
         bundle_channel,
-        Channel::get(&mut bundle_user, &bundle_channel.id.to_string(),)
+        Channel::get(&mut bundle_user, &bundle_channel.id.to_string())
             .await
             .unwrap()
     );

tests/guild.rs

@@ -1,6 +1,7 @@
-mod common;
 use chorus::types::{Guild, GuildCreateSchema};
 
+mod common;
+
 #[tokio::test]
 async fn guild_creation_deletion() {
     let mut bundle = common::setup().await;

tests/message.rs

@@ -1,9 +1,10 @@
-mod common;
-
-use chorus::types;
 use std::fs::File;
 use std::io::{BufReader, Read};
 
+use chorus::types;
+
+mod common;
+
 #[tokio::test]
 async fn send_message() {
     let mut bundle = common::setup().await;

tests/roles.rs

@@ -1,7 +1,7 @@
-mod common;
-
 use chorus::types::{self, RoleCreateModifySchema};
 
+mod common;
+
 #[tokio::test]
 async fn create_and_get_roles() {
     let mut bundle = common::setup().await;