Add internal module

Create a general `internal` module, and move `prelude_internal` to
`internal::prelude`.

22 files changed, 21 insertions, 20 deletions

diff --git a/src/client/connection.rs b/src/client/connection.rs
index 7586ae3..93c967e 100644
--- a/src/client/connection.rs
+++ b/src/client/connection.rs
@@ -24,7 +24,7 @@ use websocket::ws::receiver::Receiver as WsReceiver;
 use websocket::ws::sender::Sender as WsSender;
 use ::constants::{self, OpCode};
 use ::model::*;
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 
 enum Status {
     SendMessage(Value),
diff --git a/src/client/context.rs b/src/client/context.rs
index 6fa1ad3..d7465d1 100644
--- a/src/client/context.rs
+++ b/src/client/context.rs
@@ -15,7 +15,7 @@ use ::utils::builder::{
     GetMessages
 };
 use ::model::*;
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 use ::utils;
 
 #[derive(Clone)]
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index 875b9b3..f0d9c91 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -5,7 +5,7 @@ use super::login_type::LoginType;
 use super::{STATE, Connection, Context};
 use ::ext::framework::Framework;
 use ::model::{ChannelId, Event, Message};
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 
 macro_rules! handler {
     ($field:ident, $event_store:ident) => {
diff --git a/src/client/http/mod.rs b/src/client/http/mod.rs
index 94fccce..b77e24f 100644
--- a/src/client/http/mod.rs
+++ b/src/client/http/mod.rs
@@ -37,7 +37,7 @@ use std::io::{ErrorKind as IoErrorKind, Read};
 use std::sync::{Arc, Mutex};
 use ::constants;
 use ::model::*;
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 use ::utils::decode_array;
 
 lazy_static! {
diff --git a/src/client/http/ratelimiting.rs b/src/client/http/ratelimiting.rs
index 0302a7d..6a5ef17 100644
--- a/src/client/http/ratelimiting.rs
+++ b/src/client/http/ratelimiting.rs
@@ -7,7 +7,7 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 use std::time::Duration;
 use time;
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 
 lazy_static! {
     static ref GLOBAL: Arc<Mutex<RateLimit>> = Arc::new(Mutex::new(RateLimit::default()));
diff --git a/src/client/mod.rs b/src/client/mod.rs
index 0f0fa7a..580ae74 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -54,7 +54,7 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 use std::time::Duration;
 use ::model::*;
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 use ::ext::framework::Framework;
 use ::ext::state::State;
 
diff --git a/src/constants.rs b/src/constants.rs
index 262dffd..69d49ae 100644
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -1,4 +1,4 @@
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 
 /// The gateway version used by the library. The gateway URI is retrieved via
 /// the REST API.
diff --git a/src/internal/mod.rs b/src/internal/mod.rs
new file mode 100644
index 0000000..b9d7209
--- /dev/null
+++ b/src/internal/mod.rs
@@ -0,0 +1 @@
+pub mod prelude;
diff --git a/src/prelude_internal.rs b/src/internal/prelude.rs
index 9b6b993..9b6b993 100644
--- a/src/prelude_internal.rs
+++ b/src/internal/prelude.rs
diff --git a/src/lib.rs b/src/lib.rs
index 16a0a6f..8bc8533 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -103,7 +103,7 @@ pub mod prelude;
 
 mod constants;
 mod error;
-mod prelude_internal;
+mod internal;
 
 pub use client::Client;
 pub use error::{Error, Result};
diff --git a/src/model/channel.rs b/src/model/channel.rs
index 811d148..429fa01 100644
--- a/src/model/channel.rs
+++ b/src/model/channel.rs
@@ -19,7 +19,7 @@ use super::utils;
 use ::utils::builder::{CreateEmbed, CreateInvite, EditChannel};
 use ::client::{STATE, http};
 use ::constants;
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 use ::utils::decode_array;
 
 impl Attachment {
diff --git a/src/model/gateway.rs b/src/model/gateway.rs
index 35a65d0..ee62dd5 100644
--- a/src/model/gateway.rs
+++ b/src/model/gateway.rs
@@ -2,7 +2,7 @@ use std::collections::{BTreeMap, HashMap};
 use super::utils::*;
 use super::*;
 use ::constants::{OpCode, VoiceOpCode};
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 use ::utils::decode_array;
 
 #[derive(Clone, Debug)]
diff --git a/src/model/guild.rs b/src/model/guild.rs
index d784f30..0506115 100644
--- a/src/model/guild.rs
+++ b/src/model/guild.rs
@@ -16,7 +16,7 @@ use super::utils::{
 use super::*;
 use ::utils::builder::{EditGuild, EditMember, EditRole};
 use ::client::{STATE, http};
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 use ::utils::{Colour, decode_array};
 
 impl From<Guild> for GuildContainer {
diff --git a/src/model/id.rs b/src/model/id.rs
index faeccd3..0d9fb32 100644
--- a/src/model/id.rs
+++ b/src/model/id.rs
@@ -1,6 +1,6 @@
 use super::*;
 use ::client::{STATE, http};
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 
 impl ChannelId {
     /// Search the state for the channel with the Id.
diff --git a/src/model/invite.rs b/src/model/invite.rs
index 23b0aa3..8fd55e7 100644
--- a/src/model/invite.rs
+++ b/src/model/invite.rs
@@ -1,6 +1,6 @@
 use super::{Invite, RichInvite};
 use ::client::http;
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 use super::{permissions, utils};
 
 impl Invite {
diff --git a/src/model/misc.rs b/src/model/misc.rs
index 17b97c9..16cc7fe 100644
--- a/src/model/misc.rs
+++ b/src/model/misc.rs
@@ -10,7 +10,7 @@ use super::{
     User,
     IncidentStatus
 };
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 
 pub trait Mentionable {
     fn mention(&self) -> String;
diff --git a/src/model/mod.rs b/src/model/mod.rs
index 81750a0..fc226f9 100644
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@@ -27,7 +27,7 @@ pub use self::webhook::*;
 use self::utils::*;
 use std::collections::HashMap;
 use std::fmt;
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 use ::utils::decode_array;
 
 // All of the enums and structs are imported here. These are built from the
diff --git a/src/model/permissions.rs b/src/model/permissions.rs
index 74b1e40..c2b339e 100644
--- a/src/model/permissions.rs
+++ b/src/model/permissions.rs
@@ -37,7 +37,7 @@
 //! [Manage Roles]: constant.MANAGE_ROLES.html
 //! [Manage Webhooks]: constant.MANAGE_WEBHOOKS.html
 
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 
 /// Returns a set of permissions with the original @everyone permissions set
 /// to true.
diff --git a/src/model/user.rs b/src/model/user.rs
index b0c82cf..f748d67 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -12,7 +12,7 @@ use super::{
     User
 };
 use ::client::{STATE, http};
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 use ::utils::decode_array;
 
 impl User {
diff --git a/src/model/utils.rs b/src/model/utils.rs
index d66b258..f0108e9 100644
--- a/src/model/utils.rs
+++ b/src/model/utils.rs
@@ -16,7 +16,7 @@ use super::{
     VoiceState,
 };
 use ::client::STATE;
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 use ::utils::{decode_array, into_array};
 
 #[macro_escape]
diff --git a/src/model/webhook.rs b/src/model/webhook.rs
index caffe33..04f6d5d 100644
--- a/src/model/webhook.rs
+++ b/src/model/webhook.rs
@@ -3,7 +3,7 @@ use std::mem;
 use super::{Message, Webhook};
 use ::utils::builder::ExecuteWebhook;
 use ::client::http;
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 
 impl Webhook {
     /// Deletes the webhook.
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index 7c6f428..dbd1455 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -9,7 +9,7 @@ use std::ffi::OsStr;
 use std::fs::File;
 use std::io::Read;
 use std::path::Path;
-use ::prelude_internal::*;
+use ::internal::prelude::*;
 
 mod colour;
 mod message_builder;