diff --git a/src/api/auth/mod.rs b/src/api/auth/mod.rs index 933382c..663bf5e 100644 --- a/src/api/auth/mod.rs +++ b/src/api/auth/mod.rs @@ -3,4 +3,3 @@ pub use register::*; pub mod login; pub mod register; - diff --git a/src/api/channels/messages.rs b/src/api/channels/messages.rs index f40feb8..d511e24 100644 --- a/src/api/channels/messages.rs +++ b/src/api/channels/messages.rs @@ -1,6 +1,6 @@ use http::header::CONTENT_DISPOSITION; use http::HeaderMap; -use reqwest::{Client, multipart}; +use reqwest::{multipart, Client}; use serde_json::to_string; use crate::instance::UserMeta; diff --git a/src/api/channels/mod.rs b/src/api/channels/mod.rs index f6e56ce..b72861e 100644 --- a/src/api/channels/mod.rs +++ b/src/api/channels/mod.rs @@ -7,4 +7,3 @@ pub mod channels; pub mod messages; pub mod permissions; pub mod reactions; - diff --git a/src/api/guilds/guilds.rs b/src/api/guilds/guilds.rs index 850696f..c94d327 100644 --- a/src/api/guilds/guilds.rs +++ b/src/api/guilds/guilds.rs @@ -56,8 +56,8 @@ impl Guild { &mut user.limits, &mut belongs_to.limits, ) - .await - .unwrap(); + .await + .unwrap(); Ok(guild) } @@ -134,7 +134,7 @@ impl Guild { &mut user.limits, &mut belongs_to.limits, ) - .await + .await } /// Returns a `Result` containing a vector of `Channel` structs if the request was successful, or an `ChorusLibError` if there was an error. @@ -205,7 +205,7 @@ impl Guild { &mut user.limits, &mut belongs_to.limits, ) - .await + .await } /// For internal use. Does the same as the public get method, but does not require a second, mutable @@ -267,7 +267,7 @@ impl Channel { &mut user.limits, &mut belongs_to.limits, ) - .await + .await } async fn _create( diff --git a/src/api/mod.rs b/src/api/mod.rs index 375aff1..850a1b8 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -8,4 +8,3 @@ pub mod channels; pub mod guilds; pub mod policies; pub mod users; - diff --git a/src/api/policies/instance/mod.rs b/src/api/policies/instance/mod.rs index 79c7ffe..7be9605 100644 --- a/src/api/policies/instance/mod.rs +++ b/src/api/policies/instance/mod.rs @@ -3,4 +3,3 @@ pub use limits::*; pub mod instance; pub mod limits; - diff --git a/src/api/policies/mod.rs b/src/api/policies/mod.rs index 7f7a7e4..3e25d8c 100644 --- a/src/api/policies/mod.rs +++ b/src/api/policies/mod.rs @@ -1,4 +1,3 @@ pub use instance::limits::*; pub mod instance; - diff --git a/src/api/users/mod.rs b/src/api/users/mod.rs index 554bc22..058be4c 100644 --- a/src/api/users/mod.rs +++ b/src/api/users/mod.rs @@ -1,4 +1,3 @@ pub use users::*; pub mod users; - diff --git a/src/api/users/users.rs b/src/api/users/users.rs index b7028d5..1d35f32 100644 --- a/src/api/users/users.rs +++ b/src/api/users/users.rs @@ -115,7 +115,7 @@ impl User { &mut belongs_to.limits, id, ) - .await + .await } async fn _get( @@ -197,6 +197,6 @@ impl Instance { &mut self.limits, id, ) - .await + .await } } diff --git a/src/gateway.rs b/src/gateway.rs index ebe6bfa..8b17514 100644 --- a/src/gateway.rs +++ b/src/gateway.rs @@ -1,7 +1,7 @@ use std::sync::Arc; -use futures_util::SinkExt; use futures_util::stream::SplitSink; +use futures_util::SinkExt; use futures_util::StreamExt; use native_tls::TlsConnector; use tokio::net::TcpStream; @@ -13,8 +13,8 @@ use tokio::task; use tokio::task::JoinHandle; use tokio::time; use tokio::time::Instant; -use tokio_tungstenite::{connect_async_tls_with_config, Connector, WebSocketStream}; use tokio_tungstenite::MaybeTlsStream; +use tokio_tungstenite::{connect_async_tls_with_config, Connector, WebSocketStream}; use crate::errors::ObserverError; use crate::gateway::events::Events; @@ -203,7 +203,7 @@ impl Gateway { TlsConnector::builder().build().unwrap(), )), ) - .await + .await { Ok(websocket_stream) => websocket_stream, Err(e) => return Err(e), diff --git a/src/limit.rs b/src/limit.rs index 4cf0d7d..ce0ba4e 100644 --- a/src/limit.rs +++ b/src/limit.rs @@ -3,7 +3,7 @@ use std::collections::VecDeque; use reqwest::{Client, RequestBuilder, Response}; use crate::{ - api::limits::{Limit, Limits, LimitsMutRef, LimitType}, + api::limits::{Limit, LimitType, Limits, LimitsMutRef}, errors::ChorusLibError, }; @@ -149,7 +149,7 @@ impl LimitedRequester { &LimitType::Ip, &limit_type, ] - .to_vec(); + .to_vec(); for limit in constant_limits.iter() { match rate_limits.to_hash_map().get(limit) { Some(limit) => { @@ -159,21 +159,21 @@ impl LimitedRequester { // AbsoluteRegister and AuthRegister can cancel each other out. if limit.bucket == LimitType::AbsoluteRegister && rate_limits - .to_hash_map() - .get(&LimitType::AuthRegister) - .unwrap() - .remaining - == 0 + .to_hash_map() + .get(&LimitType::AuthRegister) + .unwrap() + .remaining + == 0 { return false; } if limit.bucket == LimitType::AuthRegister && rate_limits - .to_hash_map() - .get(&LimitType::AbsoluteRegister) - .unwrap() - .remaining - == 0 + .to_hash_map() + .get(&LimitType::AbsoluteRegister) + .unwrap() + .remaining + == 0 { return false; } diff --git a/src/types/config/mod.rs b/src/types/config/mod.rs index 181147b..521d303 100644 --- a/src/types/config/mod.rs +++ b/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::{ConfigValue, generate_pairs, pairs_to_config}; + use crate::types::config::{generate_pairs, pairs_to_config, ConfigValue}; #[test] fn test_pairs() { diff --git a/src/types/config/types/guild_configuration.rs b/src/types/config/types/guild_configuration.rs index 2afbc6a..4fedf51 100644 --- a/src/types/config/types/guild_configuration.rs +++ b/src/types/config/types/guild_configuration.rs @@ -7,15 +7,15 @@ use serde::{Deserialize, Serialize}; #[cfg(feature = "sqlx")] use sqlx::{ database::{HasArguments, HasValueRef}, - Decode, - Encode, - encode::IsNull, error::BoxDynError, MySql, + encode::IsNull, + error::BoxDynError, + Decode, Encode, 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")] diff --git a/src/types/config/types/subconfigs/limits/rates.rs b/src/types/config/types/subconfigs/limits/rates.rs index 07ebf0d..9d0cab1 100644 --- a/src/types/config/types/subconfigs/limits/rates.rs +++ b/src/types/config/types/subconfigs/limits/rates.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; use crate::types::config::types::subconfigs::limits::ratelimits::{ - RateLimitOptions, route::RouteRateLimit, + route::RouteRateLimit, RateLimitOptions, }; #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] diff --git a/src/types/config/types/subconfigs/register/mod.rs b/src/types/config/types/subconfigs/register/mod.rs index 7535f0b..a2d714e 100644 --- a/src/types/config/types/subconfigs/register/mod.rs +++ b/src/types/config/types/subconfigs/register/mod.rs @@ -5,4 +5,3 @@ pub use password::PasswordConfiguration; mod date_of_birth; mod email; mod password; - diff --git a/src/types/config/types/subconfigs/security/mod.rs b/src/types/config/types/subconfigs/security/mod.rs index b9a0ee1..8455000 100644 --- a/src/types/config/types/subconfigs/security/mod.rs +++ b/src/types/config/types/subconfigs/security/mod.rs @@ -3,4 +3,3 @@ pub use twofactor::TwoFactorConfiguration; mod captcha; mod twofactor; - diff --git a/src/types/entities/application.rs b/src/types/entities/application.rs index 13c90e0..e5c4a01 100644 --- a/src/types/entities/application.rs +++ b/src/types/entities/application.rs @@ -3,8 +3,8 @@ 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; +use crate::types::{Team, User}; #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))] diff --git a/src/types/entities/guild.rs b/src/types/entities/guild.rs index 9e31abd..f9fa2e2 100644 --- a/src/types/entities/guild.rs +++ b/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)] diff --git a/src/types/entities/mod.rs b/src/types/entities/mod.rs index 2cf8fbd..b63bb9a 100644 --- a/src/types/entities/mod.rs +++ b/src/types/entities/mod.rs @@ -43,4 +43,3 @@ mod user; mod user_settings; mod voice_state; mod webhook; - diff --git a/src/types/events/guild.rs b/src/types/events/guild.rs index acea876..f0c6108 100644 --- a/src/types/events/guild.rs +++ b/src/types/events/guild.rs @@ -1,9 +1,9 @@ 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 crate::types::{AuditLogEntry, Emoji, GuildMember, GuildScheduledEvent, RoleObject, Sticker}; use super::PresenceUpdate; diff --git a/src/types/events/ready.rs b/src/types/events/ready.rs index 70ab11b..6ed11d9 100644 --- a/src/types/events/ready.rs +++ b/src/types/events/ready.rs @@ -1,9 +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}; #[derive(Debug, Deserialize, Serialize, Default)] /// Sort of documented, though most fields are left out diff --git a/src/types/interfaces/mod.rs b/src/types/interfaces/mod.rs index d74c33d..946eb39 100644 --- a/src/types/interfaces/mod.rs +++ b/src/types/interfaces/mod.rs @@ -9,4 +9,3 @@ mod connected_account; mod guild_welcome_screen; mod interaction; mod status; - diff --git a/src/types/schema/apierror.rs b/src/types/schema/apierror.rs index b3401d8..95e72a5 100644 --- a/src/types/schema/apierror.rs +++ b/src/types/schema/apierror.rs @@ -61,8 +61,8 @@ impl poem::error::ResponseError for APIError { } fn as_response(&self) -> Response - where - Self: std::error::Error + Send + Sync + 'static, + where + Self: std::error::Error + Send + Sync + 'static, { Response::builder() .status(self.status()) diff --git a/src/types/utils/mod.rs b/src/types/utils/mod.rs index 9dfb0f9..7fd199f 100644 --- a/src/types/utils/mod.rs +++ b/src/types/utils/mod.rs @@ -6,4 +6,3 @@ pub mod jwt; mod regexes; mod rights; mod snowflake; - diff --git a/tests/auth.rs b/tests/auth.rs index c3aae92..24abefc 100644 --- a/tests/auth.rs +++ b/tests/auth.rs @@ -17,7 +17,7 @@ async fn test_registration() { None, None, ) - .unwrap(); + .unwrap(); bundle.instance.register_account(®).await.unwrap(); common::teardown(bundle).await; } diff --git a/tests/channel.rs b/tests/channel.rs index d1464be..115fed6 100644 --- a/tests/channel.rs +++ b/tests/channel.rs @@ -52,8 +52,8 @@ async fn modify_channel() { &bundle.channel.id.to_string(), &mut bundle.user, ) - .await - .unwrap(); + .await + .unwrap(); assert_eq!(result.name, Some("beepboop".to_string())); let permission_override = PermissionFlags::from_vec(Vec::from([ @@ -72,14 +72,14 @@ async fn modify_channel() { bundle.channel.id.to_string().as_str(), permission_override.clone(), ) - .await; + .await; Channel::delete_permission( &mut bundle.user, bundle.channel.id.to_string().as_str(), &permission_override.id, ) - .await; + .await; common::teardown(bundle).await } diff --git a/tests/common/mod.rs b/tests/common/mod.rs index a26fe76..c58c79a 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -38,7 +38,7 @@ pub async fn setup() -> TestBundle { None, None, ) - .unwrap(); + .unwrap(); let guild_create_schema = GuildCreateSchema { name: Some("Test-Guild!".to_string()), region: None,