diff options
| author | Zeyla Hellyer <[email protected]> | 2017-11-11 10:05:33 -0800 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-11-11 10:05:33 -0800 |
| commit | 348d52b50780109a77a5223d2ede8e0b9a490cfd (patch) | |
| tree | 1049f8ab6be8f9b22ec69a3746ae37a90c6f6a62 /src/model/guild | |
| parent | Simplify Error's `Display` impl (diff) | |
| download | serenity-348d52b50780109a77a5223d2ede8e0b9a490cfd.tar.xz serenity-348d52b50780109a77a5223d2ede8e0b9a490cfd.zip | |
Re-order use statements alphabetically
Diffstat (limited to 'src/model/guild')
| -rw-r--r-- | src/model/guild/audit_log.rs | 4 | ||||
| -rw-r--r-- | src/model/guild/emoji.rs | 10 | ||||
| -rw-r--r-- | src/model/guild/member.rs | 10 | ||||
| -rw-r--r-- | src/model/guild/mod.rs | 10 | ||||
| -rw-r--r-- | src/model/guild/partial_guild.rs | 2 | ||||
| -rw-r--r-- | src/model/guild/role.rs | 6 |
6 files changed, 19 insertions, 23 deletions
diff --git a/src/model/guild/audit_log.rs b/src/model/guild/audit_log.rs index b3caa73..51138e0 100644 --- a/src/model/guild/audit_log.rs +++ b/src/model/guild/audit_log.rs @@ -1,8 +1,8 @@ -use super::super::{AuditLogEntryId, User, UserId, ChannelId, Webhook}; use serde::de::{self, Deserialize, Deserializer, MapAccess, Visitor}; -use std::fmt; +use super::super::{AuditLogEntryId, User, UserId, ChannelId, Webhook}; use std::collections::HashMap; use std::mem::transmute; +use std::fmt; /// Determines to what entity an action was used on. #[derive(Debug)] diff --git a/src/model/guild/emoji.rs b/src/model/guild/emoji.rs index 7f332ae..31d2a1f 100644 --- a/src/model/guild/emoji.rs +++ b/src/model/guild/emoji.rs @@ -2,17 +2,15 @@ use std::fmt::{Display, Formatter, Result as FmtResult, Write as FmtWrite}; use super::super::{EmojiId, RoleId}; #[cfg(all(feature = "cache", feature = "model"))] +use internal::prelude::*; +#[cfg(all(feature = "cache", feature = "model"))] use std::mem; #[cfg(all(feature = "cache", feature = "model"))] use super::super::ModelError; #[cfg(all(feature = "cache", feature = "model"))] -use CACHE; -#[cfg(all(feature = "cache", feature = "model"))] -use internal::prelude::*; -#[cfg(all(feature = "cache", feature = "model"))] -use http; -#[cfg(all(feature = "cache", feature = "model"))] use super::super::GuildId; +#[cfg(all(feature = "cache", feature = "model"))] +use {CACHE, http}; /// Represents a custom guild emoji, which can either be created using the API, /// or via an integration. Emojis created using the API only work within the diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs index 2c31bc3..74b0f69 100644 --- a/src/model/guild/member.rs +++ b/src/model/guild/member.rs @@ -1,14 +1,14 @@ +use model::*; use chrono::{DateTime, FixedOffset}; use std::fmt::{Display, Formatter, Result as FmtResult}; use super::deserialize_sync_user; -use model::*; -#[cfg(feature = "model")] -use std::borrow::Cow; -#[cfg(all(feature = "cache", feature = "model"))] -use internal::prelude::*; #[cfg(all(feature = "builder", feature = "cache", feature = "model"))] use builder::EditMember; +#[cfg(all(feature = "cache", feature = "model"))] +use internal::prelude::*; +#[cfg(feature = "model")] +use std::borrow::Cow; #[cfg(all(feature = "cache", feature = "model", feature = "utils"))] use utils::Colour; #[cfg(all(feature = "cache", feature = "model"))] diff --git a/src/model/guild/mod.rs b/src/model/guild/mod.rs index 1e0ef7c..fe2150a 100644 --- a/src/model/guild/mod.rs +++ b/src/model/guild/mod.rs @@ -15,10 +15,10 @@ pub use self::role::*; pub use self::audit_log::*; use chrono::{DateTime, FixedOffset}; +use model::*; use serde::de::Error as DeError; use serde_json; use super::utils::*; -use model::*; #[cfg(all(feature = "cache", feature = "model"))] use CACHE; @@ -242,11 +242,11 @@ impl Guild { /// /// [`AuditLogs`]: audit_log/struct.AuditLogs.html #[inline] - pub fn audit_logs(&self, action_type: Option<u8>, - user_id: Option<UserId>, + pub fn audit_logs(&self, action_type: Option<u8>, + user_id: Option<UserId>, before: Option<AuditLogEntryId>, - limit: Option<u8>) -> Result<AuditLogs> { - self.id.audit_logs(action_type, user_id, before, limit) + limit: Option<u8>) -> Result<AuditLogs> { + self.id.audit_logs(action_type, user_id, before, limit) } /// Gets all of the guild's channels over the REST API. diff --git a/src/model/guild/partial_guild.rs b/src/model/guild/partial_guild.rs index c4181fd..c33c8d0 100644 --- a/src/model/guild/partial_guild.rs +++ b/src/model/guild/partial_guild.rs @@ -1,5 +1,5 @@ -use super::super::utils::{deserialize_emojis, deserialize_roles}; use model::*; +use super::super::utils::{deserialize_emojis, deserialize_roles}; #[cfg(feature = "model")] use builder::{EditGuild, EditMember, EditRole}; diff --git a/src/model/guild/role.rs b/src/model/guild/role.rs index 3ed718e..97a9cf6 100644 --- a/src/model/guild/role.rs +++ b/src/model/guild/role.rs @@ -1,14 +1,12 @@ -use std::cmp::Ordering; use model::*; +use std::cmp::Ordering; -#[cfg(all(feature = "cache", feature = "model"))] -use CACHE; #[cfg(all(feature = "builder", feature = "cache", feature = "model"))] use builder::EditRole; #[cfg(all(feature = "cache", feature = "model"))] use internal::prelude::*; #[cfg(all(feature = "cache", feature = "model"))] -use http; +use {CACHE, http}; /// Information about a role within a guild. A role represents a set of /// permissions, and can be attached to one or multiple users. A role has |