Reformat entire project, optimize imports

This commit is contained in:
Flori Weber 2023-06-11 13:52:53 +02:00
parent f641dbb14f
commit c745861592
27 changed files with 41 additions and 52 deletions

View File

@ -3,4 +3,3 @@ pub use register::*;
pub mod login;
pub mod register;

View File

@ -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;

View File

@ -7,4 +7,3 @@ pub mod channels;
pub mod messages;
pub mod permissions;
pub mod reactions;

View File

@ -8,4 +8,3 @@ pub mod channels;
pub mod guilds;
pub mod policies;
pub mod users;

View File

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

View File

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

View File

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

View File

@ -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;

View File

@ -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,
};

View File

@ -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() {

View File

@ -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")]

View File

@ -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)]

View File

@ -5,4 +5,3 @@ pub use password::PasswordConfiguration;
mod date_of_birth;
mod email;
mod password;

View File

@ -3,4 +3,3 @@ pub use twofactor::TwoFactorConfiguration;
mod captcha;
mod twofactor;

View File

@ -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))]

View File

@ -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)]

View File

@ -43,4 +43,3 @@ mod user;
mod user_settings;
mod voice_state;
mod webhook;

View File

@ -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;

View File

@ -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

View File

@ -9,4 +9,3 @@ mod connected_account;
mod guild_welcome_screen;
mod interaction;
mod status;

View File

@ -6,4 +6,3 @@ pub mod jwt;
mod regexes;
mod rights;
mod snowflake;