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/channel | |
| 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/channel')
| -rw-r--r-- | src/model/channel/attachment.rs | 4 | ||||
| -rw-r--r-- | src/model/channel/channel_id.rs | 4 | ||||
| -rw-r--r-- | src/model/channel/embed.rs | 8 | ||||
| -rw-r--r-- | src/model/channel/guild_channel.rs | 8 | ||||
| -rw-r--r-- | src/model/channel/message.rs | 14 | ||||
| -rw-r--r-- | src/model/channel/mod.rs | 6 | ||||
| -rw-r--r-- | src/model/channel/private_channel.rs | 2 | ||||
| -rw-r--r-- | src/model/channel/reaction.rs | 4 |
8 files changed, 23 insertions, 27 deletions
diff --git a/src/model/channel/attachment.rs b/src/model/channel/attachment.rs index f520cd4..1836498 100644 --- a/src/model/channel/attachment.rs +++ b/src/model/channel/attachment.rs @@ -1,9 +1,9 @@ #[cfg(feature = "model")] use hyper::Client as HyperClient; #[cfg(feature = "model")] -use std::io::Read; -#[cfg(feature = "model")] use internal::prelude::*; +#[cfg(feature = "model")] +use std::io::Read; /// A file uploaded with a message. Not to be confused with [`Embed`]s. /// diff --git a/src/model/channel/channel_id.rs b/src/model/channel/channel_id.rs index 158ebcf..acd3704 100644 --- a/src/model/channel/channel_id.rs +++ b/src/model/channel/channel_id.rs @@ -1,5 +1,5 @@ -use model::*; use internal::RwLockExt; +use model::*; #[cfg(feature = "model")] use std::borrow::Cow; @@ -124,7 +124,7 @@ impl ChannelId { .into_iter() .map(|message_id| message_id.as_ref().0) .collect::<Vec<u64>>(); - + if ids.len() == 1 { self.delete_message(ids[0]) } else { diff --git a/src/model/channel/embed.rs b/src/model/channel/embed.rs index 401f10d..a839beb 100644 --- a/src/model/channel/embed.rs +++ b/src/model/channel/embed.rs @@ -1,10 +1,10 @@ -#[cfg(feature = "utils")] -use utils::Colour; -#[cfg(feature = "model")] -use internal::prelude::*; #[cfg(feature = "model")] use builder::CreateEmbed; #[cfg(feature = "model")] +use internal::prelude::*; +#[cfg(feature = "utils")] +use utils::Colour; +#[cfg(feature = "model")] use utils; /// Represents a rich embed which allows using richer markdown, multiple fields diff --git a/src/model/channel/guild_channel.rs b/src/model/channel/guild_channel.rs index 76cea47..54f802d 100644 --- a/src/model/channel/guild_channel.rs +++ b/src/model/channel/guild_channel.rs @@ -1,10 +1,6 @@ use chrono::{DateTime, FixedOffset}; use model::*; -#[cfg(feature = "model")] -use std::fmt::{Display, Formatter, Result as FmtResult}; -#[cfg(feature = "model")] -use std::mem; #[cfg(all(feature = "cache", feature = "model"))] use CACHE; #[cfg(feature = "model")] @@ -13,6 +9,10 @@ use builder::{CreateInvite, CreateMessage, EditChannel, GetMessages}; use http::{self, AttachmentType}; #[cfg(all(feature = "cache", feature = "model"))] use internal::prelude::*; +#[cfg(feature = "model")] +use std::fmt::{Display, Formatter, Result as FmtResult}; +#[cfg(feature = "model")] +use std::mem; #[cfg(all(feature = "model", feature = "utils"))] use utils as serenity_utils; diff --git a/src/model/channel/message.rs b/src/model/channel/message.rs index 984e274..8dcaccb 100644 --- a/src/model/channel/message.rs +++ b/src/model/channel/message.rs @@ -1,21 +1,17 @@ use chrono::{DateTime, FixedOffset}; -use serde_json::Value; use model::*; +use serde_json::Value; -#[cfg(all(feature = "cache", feature = "model"))] -use std::fmt::Write; -#[cfg(feature = "model")] -use std::mem; #[cfg(feature = "model")] use builder::{CreateEmbed, CreateMessage}; -#[cfg(feature = "model")] -use constants; #[cfg(all(feature = "cache", feature = "model"))] use CACHE; +#[cfg(all(feature = "cache", feature = "model"))] +use std::fmt::Write; #[cfg(feature = "model")] -use http; +use std::mem; #[cfg(feature = "model")] -use utils as serenity_utils; +use {constants, http, utils as serenity_utils}; /// A representation of a message over a guild's text channel, a group, or a /// private channel. diff --git a/src/model/channel/mod.rs b/src/model/channel/mod.rs index ae46805..2fc4cbc 100644 --- a/src/model/channel/mod.rs +++ b/src/model/channel/mod.rs @@ -19,17 +19,17 @@ pub use self::reaction::*; pub use self::channel_category::*; use internal::RwLockExt; +use model::*; use serde::de::Error as DeError; use serde_json; use super::utils::deserialize_u64; -use model::*; #[cfg(feature = "model")] -use std::fmt::{Display, Formatter, Result as FmtResult}; -#[cfg(feature = "model")] use builder::{CreateMessage, GetMessages}; #[cfg(feature = "model")] use http::AttachmentType; +#[cfg(feature = "model")] +use std::fmt::{Display, Formatter, Result as FmtResult}; /// A container for any channel. #[derive(Clone, Debug)] diff --git a/src/model/channel/private_channel.rs b/src/model/channel/private_channel.rs index 01b387a..80a59bb 100644 --- a/src/model/channel/private_channel.rs +++ b/src/model/channel/private_channel.rs @@ -1,7 +1,7 @@ use chrono::{DateTime, FixedOffset}; +use model::*; use std::fmt::{Display, Formatter, Result as FmtResult}; use super::deserialize_single_recipient; -use model::*; #[cfg(feature = "model")] use builder::{CreateMessage, GetMessages}; diff --git a/src/model/channel/reaction.rs b/src/model/channel/reaction.rs index 69116d7..7b93716 100644 --- a/src/model/channel/reaction.rs +++ b/src/model/channel/reaction.rs @@ -1,9 +1,9 @@ +use model::*; use serde::de::{Deserialize, Error as DeError, MapAccess, Visitor}; +use std::error::Error as StdError; use std::fmt::{Display, Formatter, Result as FmtResult, Write as FmtWrite}; use std::str::FromStr; -use std::error::Error as StdError; use internal::prelude::*; -use model::*; #[cfg(all(feature = "cache", feature = "model"))] use CACHE; |