aboutsummaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorAustin Hellyer <[email protected]>2016-11-14 18:23:29 -0800
committerAustin Hellyer <[email protected]>2016-11-14 18:23:29 -0800
commit80ec9fe2b19f05871d134c9b08d4fc607ec37af6 (patch)
treea18af5274a1fce359004fbcd4f9fd2267904ba90 /src/model
parentEmbedAuthor 'url' is optional (diff)
downloadserenity-80ec9fe2b19f05871d134c9b08d4fc607ec37af6.tar.xz
serenity-80ec9fe2b19f05871d134c9b08d4fc607ec37af6.zip
Add internal module
Create a general `internal` module, and move `prelude_internal` to `internal::prelude`.
Diffstat (limited to 'src/model')
-rw-r--r--src/model/channel.rs2
-rw-r--r--src/model/gateway.rs2
-rw-r--r--src/model/guild.rs2
-rw-r--r--src/model/id.rs2
-rw-r--r--src/model/invite.rs2
-rw-r--r--src/model/misc.rs2
-rw-r--r--src/model/mod.rs2
-rw-r--r--src/model/permissions.rs2
-rw-r--r--src/model/user.rs2
-rw-r--r--src/model/utils.rs2
-rw-r--r--src/model/webhook.rs2
11 files changed, 11 insertions, 11 deletions
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.