aboutsummaryrefslogtreecommitdiff
path: root/src/framework
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-11-11 10:05:33 -0800
committerZeyla Hellyer <[email protected]>2017-11-11 10:05:33 -0800
commit348d52b50780109a77a5223d2ede8e0b9a490cfd (patch)
tree1049f8ab6be8f9b22ec69a3746ae37a90c6f6a62 /src/framework
parentSimplify Error's `Display` impl (diff)
downloadserenity-348d52b50780109a77a5223d2ede8e0b9a490cfd.tar.xz
serenity-348d52b50780109a77a5223d2ede8e0b9a490cfd.zip
Re-order use statements alphabetically
Diffstat (limited to 'src/framework')
-rw-r--r--src/framework/standard/args.rs2
-rw-r--r--src/framework/standard/buckets.rs4
-rw-r--r--src/framework/standard/command.rs4
-rw-r--r--src/framework/standard/configuration.rs6
-rw-r--r--src/framework/standard/create_command.rs4
-rw-r--r--src/framework/standard/create_group.rs4
-rw-r--r--src/framework/standard/help_commands.rs6
-rw-r--r--src/framework/standard/mod.rs10
8 files changed, 20 insertions, 20 deletions
diff --git a/src/framework/standard/args.rs b/src/framework/standard/args.rs
index 2a5c134..1425e4c 100644
--- a/src/framework/standard/args.rs
+++ b/src/framework/standard/args.rs
@@ -1,8 +1,8 @@
-use vec_shift::Shift;
use std::str::FromStr;
use std::error::Error as StdError;
use std::fmt;
use utils::parse_quotes;
+use vec_shift::Shift;
/// Defines how an operation on an `Args` method failed.
#[derive(Debug)]
diff --git a/src/framework/standard/buckets.rs b/src/framework/standard/buckets.rs
index 8005a51..60316b1 100644
--- a/src/framework/standard/buckets.rs
+++ b/src/framework/standard/buckets.rs
@@ -1,8 +1,8 @@
use chrono::Utc;
-use std::collections::HashMap;
-use std::default::Default;
use client::Context;
use model::{ChannelId, GuildId, UserId};
+use std::collections::HashMap;
+use std::default::Default;
#[cfg(feature = "cache")]
type Check = Fn(&mut Context, Option<GuildId>, ChannelId, UserId) -> bool + Send + Sync + 'static;
diff --git a/src/framework/standard/command.rs b/src/framework/standard/command.rs
index 8afb583..14b77ba 100644
--- a/src/framework/standard/command.rs
+++ b/src/framework/standard/command.rs
@@ -1,9 +1,9 @@
-use std::sync::Arc;
-use super::{Args, Configuration};
use client::Context;
use model::{Message, Permissions};
use std::collections::HashMap;
use std::fmt;
+use std::sync::Arc;
+use super::{Args, Configuration};
pub type Check = Fn(&mut Context, &Message, &mut Args, &Arc<Command>) -> bool
+ Send
diff --git a/src/framework/standard/configuration.rs b/src/framework/standard/configuration.rs
index 6cb5767..6a17146 100644
--- a/src/framework/standard/configuration.rs
+++ b/src/framework/standard/configuration.rs
@@ -1,9 +1,9 @@
-use std::collections::HashSet;
-use std::default::Default;
-use super::command::PrefixCheck;
use client::Context;
use http;
use model::{GuildId, Message, UserId};
+use std::collections::HashSet;
+use std::default::Default;
+use super::command::PrefixCheck;
/// The configuration to use for a [`Framework`] associated with a [`Client`]
/// instance.
diff --git a/src/framework/standard/create_command.rs b/src/framework/standard/create_command.rs
index 4788a05..cfddf06 100644
--- a/src/framework/standard/create_command.rs
+++ b/src/framework/standard/create_command.rs
@@ -1,9 +1,9 @@
pub use super::{Args, Command, CommandGroup, CommandType, CommandError};
-use std::collections::HashMap;
-use std::sync::Arc;
use client::Context;
use model::{Message, Permissions};
+use std::collections::HashMap;
+use std::sync::Arc;
#[derive(Debug)]
pub struct CreateCommand(pub Command);
diff --git a/src/framework/standard/create_group.rs b/src/framework/standard/create_group.rs
index 39fbcc6..fb3ceb6 100644
--- a/src/framework/standard/create_group.rs
+++ b/src/framework/standard/create_group.rs
@@ -3,11 +3,11 @@ pub(crate) use super::command::CommandOrAlias;
pub use super::create_command::CreateCommand;
pub use super::Args;
-use std::default::Default;
-use std::sync::Arc;
use client::Context;
use model::{Message, Permissions};
use std::collections::HashMap;
+use std::default::Default;
+use std::sync::Arc;
/// Used to create command groups
///
diff --git a/src/framework/standard/help_commands.rs b/src/framework/standard/help_commands.rs
index 8cbcb21..1e17c04 100644
--- a/src/framework/standard/help_commands.rs
+++ b/src/framework/standard/help_commands.rs
@@ -23,15 +23,15 @@
//! [`plain`]: fn.plain.html
//! [`with_embeds`]: fn.with_embeds.html
+use client::Context;
+use framework::standard::{has_correct_roles, has_correct_permissions};
+use model::{ChannelId, Message};
use std::collections::HashMap;
use std::sync::Arc;
use std::fmt::Write;
use super::command::InternalCommand;
use super::{Args, Command, CommandGroup, CommandOrAlias, CommandError};
-use client::Context;
-use model::{ChannelId, Message};
use utils::Colour;
-use framework::standard::{has_correct_roles, has_correct_permissions};
fn error_embed(channel_id: &ChannelId, input: &str) {
let _ = channel_id.send_message(|m| {
diff --git a/src/framework/standard/mod.rs b/src/framework/standard/mod.rs
index fdab3a8..12ad797 100644
--- a/src/framework/standard/mod.rs
+++ b/src/framework/standard/mod.rs
@@ -8,23 +8,23 @@ mod create_group;
mod buckets;
mod args;
+pub use self::args::{Args, Iter, FromStrZc, Error as ArgError};
pub(crate) use self::buckets::{Bucket, Ratelimit};
pub use self::command::{Command, CommandGroup, CommandType, Error as CommandError};
pub use self::command::CommandOrAlias;
pub use self::configuration::Configuration;
pub use self::create_command::CreateCommand;
pub use self::create_group::CreateGroup;
-pub use self::args::{Args, Iter, FromStrZc, Error as ArgError};
+use client::Context;
+use internal::RwLockExt;
+use model::{ChannelId, GuildId, Guild, Member, Message, UserId};
+use model::permissions::Permissions;
use self::command::{AfterHook, BeforeHook};
use std::collections::HashMap;
use std::default::Default;
use std::sync::Arc;
-use client::Context;
use super::Framework;
-use model::{ChannelId, GuildId, Guild, Member, Message, UserId};
-use model::permissions::Permissions;
-use internal::RwLockExt;
#[cfg(feature = "cache")]
use client::CACHE;