Update to Rust 2018 (#445)

25 files changed, 125 insertions, 125 deletions

diff --git a/src/model/channel/attachment.rs b/src/model/channel/attachment.rs
index 4fd6305..42ae915 100644
--- a/src/model/channel/attachment.rs
+++ b/src/model/channel/attachment.rs
@@ -1,7 +1,7 @@
 #[cfg(feature = "model")]
 use reqwest::Client as ReqwestClient;
 #[cfg(feature = "model")]
-use internal::prelude::*;
+use crate::internal::prelude::*;
 #[cfg(feature = "model")]
 use std::io::Read;
 
diff --git a/src/model/channel/channel_category.rs b/src/model/channel/channel_category.rs
index f57910e..f38b0f6 100644
--- a/src/model/channel/channel_category.rs
+++ b/src/model/channel/channel_category.rs
@@ -1,11 +1,11 @@
-use model::prelude::*;
+use crate::model::prelude::*;
 
 #[cfg(all(feature = "builder", feature = "model"))]
-use builder::EditChannel;
+use crate::builder::EditChannel;
 #[cfg(all(feature = "builder", feature = "model"))]
-use http;
+use crate::http;
 #[cfg(all(feature = "model", feature = "utils"))]
-use utils::{self as serenity_utils, VecMap};
+use crate::utils::{self as serenity_utils, VecMap};
 
 /// A category of [`GuildChannel`]s.
 ///
diff --git a/src/model/channel/channel_id.rs b/src/model/channel/channel_id.rs
index 7314594..63e1d1d 100644
--- a/src/model/channel/channel_id.rs
+++ b/src/model/channel/channel_id.rs
@@ -1,25 +1,25 @@
-use internal::RwLockExt;
-use model::prelude::*;
+use crate::internal::RwLockExt;
+use crate::model::prelude::*;
 
 #[cfg(feature = "model")]
 use std::borrow::Cow;
 #[cfg(feature = "model")]
 use std::fmt::Write as FmtWrite;
 #[cfg(feature = "model")]
-use builder::{
+use crate::builder::{
     CreateMessage,
     EditChannel,
     EditMessage,
     GetMessages
 };
 #[cfg(all(feature = "cache", feature = "model"))]
-use CACHE;
+use crate::CACHE;
 #[cfg(all(feature = "cache", feature = "model"))]
-use Cache;
+use crate::Cache;
 #[cfg(feature = "model")]
-use http::{self, AttachmentType};
+use crate::http::{self, AttachmentType};
 #[cfg(feature = "model")]
-use utils;
+use crate::utils;
 
 #[cfg(feature = "model")]
 impl ChannelId {
diff --git a/src/model/channel/embed.rs b/src/model/channel/embed.rs
index 8ce7696..9a7bda4 100644
--- a/src/model/channel/embed.rs
+++ b/src/model/channel/embed.rs
@@ -1,11 +1,11 @@
 #[cfg(feature = "model")]
-use builder::CreateEmbed;
+use crate::builder::CreateEmbed;
 #[cfg(feature = "model")]
-use internal::prelude::*;
+use crate::internal::prelude::*;
 #[cfg(feature = "utils")]
-use utils::Colour;
+use crate::utils::Colour;
 #[cfg(feature = "model")]
-use utils;
+use crate::utils;
 
 /// Represents a rich embed which allows using richer markdown, multiple fields
 /// and more. This was heavily inspired by [slack's attachments].
diff --git a/src/model/channel/group.rs b/src/model/channel/group.rs
index 5607f3c..52302a3 100644
--- a/src/model/channel/group.rs
+++ b/src/model/channel/group.rs
@@ -1,16 +1,16 @@
 use chrono::{DateTime, FixedOffset};
-use model::prelude::*;
+use crate::model::prelude::*;
 
 #[cfg(feature = "model")]
-use builder::{
+use crate::builder::{
     CreateMessage,
     EditMessage,
     GetMessages
 };
 #[cfg(feature = "model")]
-use http::{self, AttachmentType};
+use crate::http::{self, AttachmentType};
 #[cfg(feature = "model")]
-use internal::RwLockExt;
+use crate::internal::RwLockExt;
 #[cfg(feature = "model")]
 use std::borrow::Cow;
 #[cfg(feature = "model")]
diff --git a/src/model/channel/guild_channel.rs b/src/model/channel/guild_channel.rs
index e667efa..b976b0b 100644
--- a/src/model/channel/guild_channel.rs
+++ b/src/model/channel/guild_channel.rs
@@ -1,10 +1,10 @@
 use chrono::{DateTime, FixedOffset};
-use model::prelude::*;
+use crate::model::prelude::*;
 
 #[cfg(all(feature = "cache", feature = "model"))]
-use CACHE;
+use crate::CACHE;
 #[cfg(feature = "model")]
-use builder::{
+use crate::builder::{
     CreateInvite,
     CreateMessage,
     EditChannel,
@@ -12,9 +12,9 @@ use builder::{
     GetMessages
 };
 #[cfg(feature = "model")]
-use http::{self, AttachmentType};
+use crate::http::{self, AttachmentType};
 #[cfg(all(feature = "cache", feature = "model"))]
-use internal::prelude::*;
+use crate::internal::prelude::*;
 #[cfg(feature = "model")]
 use std::fmt::{
     Display,
@@ -24,7 +24,7 @@ use std::fmt::{
 #[cfg(feature = "model")]
 use std::mem;
 #[cfg(all(feature = "model", feature = "utils"))]
-use utils::{self as serenity_utils, VecMap};
+use crate::utils::{self as serenity_utils, VecMap};
 
 /// Represents a guild's text or voice channel. Some methods are available only
 /// for voice channels and some are only available for text channels.
diff --git a/src/model/channel/message.rs b/src/model/channel/message.rs
index 0439c15..28c00fe 100644
--- a/src/model/channel/message.rs
+++ b/src/model/channel/message.rs
@@ -1,19 +1,19 @@
 //! Models relating to Discord channels.
 
 use chrono::{DateTime, FixedOffset};
-use model::prelude::*;
+use crate::model::prelude::*;
 use serde_json::Value;
 
 #[cfg(feature = "model")]
-use builder::{CreateEmbed, EditMessage};
+use crate::builder::{CreateEmbed, EditMessage};
 #[cfg(all(feature = "cache", feature = "model"))]
-use CACHE;
+use crate::CACHE;
 #[cfg(all(feature = "cache", feature = "model"))]
 use std::fmt::Write;
 #[cfg(feature = "model")]
 use std::mem;
 #[cfg(feature = "model")]
-use {constants, http, utils as serenity_utils};
+use crate::{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 650c203..9c913cb 100644
--- a/src/model/channel/mod.rs
+++ b/src/model/channel/mod.rs
@@ -20,8 +20,8 @@ pub use self::private_channel::*;
 pub use self::reaction::*;
 pub use self::channel_category::*;
 
-use internal::RwLockExt;
-use model::prelude::*;
+use crate::internal::RwLockExt;
+use crate::model::prelude::*;
 use serde::de::Error as DeError;
 use serde::ser::{SerializeStruct, Serialize, Serializer};
 use serde_json;
@@ -33,9 +33,9 @@ use std::fmt::{Display, Formatter, Result as FmtResult};
 #[cfg(all(feature = "cache", feature = "model", feature = "utils"))]
 use std::str::FromStr;
 #[cfg(all(feature = "cache", feature = "model", feature = "utils"))]
-use model::misc::ChannelParseError;
+use crate::model::misc::ChannelParseError;
 #[cfg(all(feature = "cache", feature = "model", feature = "utils"))]
-use utils::parse_channel;
+use crate::utils::parse_channel;
 
 /// A container for any channel.
 #[derive(Clone, Debug)]
@@ -476,7 +476,7 @@ pub enum PermissionOverwriteType {
 mod test {
     #[cfg(all(feature = "model", feature = "utils"))]
     mod model_utils {
-        use model::prelude::*;
+        use crate::model::prelude::*;
         use parking_lot::RwLock;
         use std::collections::HashMap;
         use std::sync::Arc;
diff --git a/src/model/channel/private_channel.rs b/src/model/channel/private_channel.rs
index 30defca..e3e83ed 100644
--- a/src/model/channel/private_channel.rs
+++ b/src/model/channel/private_channel.rs
@@ -1,5 +1,5 @@
 use chrono::{DateTime, FixedOffset};
-use model::prelude::*;
+use crate::model::prelude::*;
 use std::fmt::{
     Display,
     Formatter,
@@ -8,15 +8,15 @@ use std::fmt::{
 use super::deserialize_single_recipient;
 
 #[cfg(feature = "model")]
-use builder::{
+use crate::builder::{
     CreateMessage,
     EditMessage,
     GetMessages
 };
 #[cfg(feature = "model")]
-use http::AttachmentType;
+use crate::http::AttachmentType;
 #[cfg(feature = "model")]
-use internal::RwLockExt;
+use crate::internal::RwLockExt;
 
 /// A Direct Message text channel with another user.
 #[derive(Clone, Debug, Deserialize, Serialize)]
diff --git a/src/model/channel/reaction.rs b/src/model/channel/reaction.rs
index c34eff7..a1df12a 100644
--- a/src/model/channel/reaction.rs
+++ b/src/model/channel/reaction.rs
@@ -1,4 +1,4 @@
-use model::prelude::*;
+use crate::model::prelude::*;
 use serde::de::{Deserialize, Error as DeError, MapAccess, Visitor};
 use serde::ser::{SerializeMap, Serialize, Serializer};
 use std::{
@@ -11,12 +11,12 @@ use std::{
     },
     str::FromStr
 };
-use internal::prelude::*;
+use crate::internal::prelude::*;
 
 #[cfg(all(feature = "cache", feature = "model"))]
-use CACHE;
+use crate::CACHE;
 #[cfg(feature = "model")]
-use http;
+use crate::http;
 
 /// An emoji reaction to a message.
 #[derive(Clone, Debug, Deserialize, Serialize)]
diff --git a/src/model/event.rs b/src/model/event.rs
index 9e5c892..f1e7363 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -11,13 +11,13 @@ use serde_json;
 use std::collections::HashMap;
 use super::utils::deserialize_emojis;
 use super::prelude::*;
-use constants::{OpCode, VoiceOpCode};
-use internal::prelude::*;
+use crate::constants::{OpCode, VoiceOpCode};
+use crate::internal::prelude::*;
 
 #[cfg(feature = "cache")]
-use cache::{Cache, CacheUpdate};
+use crate::cache::{Cache, CacheUpdate};
 #[cfg(feature = "cache")]
-use internal::RwLockExt;
+use crate::internal::RwLockExt;
 #[cfg(feature = "cache")]
 use std::collections::hash_map::Entry;
 #[cfg(feature = "cache")]
@@ -1247,7 +1247,7 @@ pub struct WebhookUpdateEvent {
     pub guild_id: GuildId,
 }
 
-#[allow(large_enum_variant)]
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, Serialize)]
 #[serde(untagged)]
 pub enum GatewayEvent {
@@ -1327,7 +1327,7 @@ impl<'de> Deserialize<'de> for GatewayEvent {
 }
 
 /// Event received over a websocket connection
-#[allow(large_enum_variant)]
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum Event {
     /// A [`Channel`] was created.
@@ -1868,19 +1868,19 @@ impl<'de> Deserialize<'de> for EventType {
     }
 }
 
-#[allow(missing_docs)]
+#[allow(clippy::missing_docs)]
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
 pub struct VoiceHeartbeat {
     pub nonce: u64,
 }
 
-#[allow(missing_docs)]
+#[allow(clippy::missing_docs)]
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
 pub struct VoiceHeartbeatAck {
     pub nonce: u64,
 }
 
-#[allow(missing_docs)]
+#[allow(clippy::missing_docs)]
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct VoiceReady {
     pub heartbeat_interval: u64,
@@ -1889,20 +1889,20 @@ pub struct VoiceReady {
     pub ssrc: u32,
 }
 
-#[allow(missing_docs)]
+#[allow(clippy::missing_docs)]
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct VoiceHello {
     pub heartbeat_interval: u64,
 }
 
-#[allow(missing_docs)]
+#[allow(clippy::missing_docs)]
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct VoiceSessionDescription {
     pub mode: String,
     pub secret_key: Vec<u8>,
 }
 
-#[allow(missing_docs)]
+#[allow(clippy::missing_docs)]
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
 pub struct VoiceSpeaking {
     pub speaking: bool,
@@ -1910,7 +1910,7 @@ pub struct VoiceSpeaking {
     pub user_id: UserId,
 }
 
-#[allow(missing_docs)]
+#[allow(clippy::missing_docs)]
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct VoiceResume {
     pub server_id: String,
@@ -1918,7 +1918,7 @@ pub struct VoiceResume {
     pub token: String,
 }
 
-#[allow(missing_docs)]
+#[allow(clippy::missing_docs)]
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
 pub struct VoiceClientDisconnect {
     pub user_id: UserId,
diff --git a/src/model/guild/audit_log.rs b/src/model/guild/audit_log.rs
index e4a344c..1ecc2c6 100644
--- a/src/model/guild/audit_log.rs
+++ b/src/model/guild/audit_log.rs
@@ -1,4 +1,4 @@
-use internal::prelude::*;
+use crate::internal::prelude::*;
 use serde::de::{
     self,
     Deserialize,
diff --git a/src/model/guild/emoji.rs b/src/model/guild/emoji.rs
index 51c660f..03c7a7e 100644
--- a/src/model/guild/emoji.rs
+++ b/src/model/guild/emoji.rs
@@ -7,7 +7,7 @@ use std::fmt::{
 use super::super::id::{EmojiId, RoleId};
 
 #[cfg(all(feature = "cache", feature = "model"))]
-use internal::prelude::*;
+use crate::internal::prelude::*;
 #[cfg(all(feature = "cache", feature = "model"))]
 use std::mem;
 #[cfg(all(feature = "cache", feature = "model"))]
@@ -15,7 +15,7 @@ use super::super::ModelError;
 #[cfg(all(feature = "cache", feature = "model"))]
 use super::super::id::GuildId;
 #[cfg(all(feature = "cache", feature = "model"))]
-use {CACHE, http};
+use crate::{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/guild_id.rs b/src/model/guild/guild_id.rs
index a7872f5..c488b52 100644
--- a/src/model/guild/guild_id.rs
+++ b/src/model/guild/guild_id.rs
@@ -1,15 +1,15 @@
-use model::prelude::*;
+use crate::model::prelude::*;
 
 #[cfg(all(feature = "cache", feature = "model"))]
-use CACHE;
+use crate::CACHE;
 #[cfg(feature = "model")]
-use builder::{EditGuild, EditMember, EditRole};
+use crate::builder::{EditGuild, EditMember, EditRole};
 #[cfg(feature = "model")]
-use internal::prelude::*;
+use crate::internal::prelude::*;
 #[cfg(feature = "model")]
-use model::guild::BanOptions;
+use crate::model::guild::BanOptions;
 #[cfg(feature = "model")]
-use {http, utils};
+use crate::{http, utils};
 
 #[cfg(feature = "model")]
 impl GuildId {
@@ -563,7 +563,7 @@ impl GuildId {
     /// [`utils::shard_id`]: ../../utils/fn.shard_id.html
     #[cfg(all(feature = "cache", feature = "utils"))]
     #[inline]
-    pub fn shard_id(&self) -> u64 { ::utils::shard_id(self.0, CACHE.read().shard_count) }
+    pub fn shard_id(&self) -> u64 { crate::utils::shard_id(self.0, CACHE.read().shard_count) }
 
     /// Returns the Id of the shard associated with the guild.
     ///
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs
index dae2b41..cbda4c3 100644
--- a/src/model/guild/member.rs
+++ b/src/model/guild/member.rs
@@ -1,4 +1,4 @@
-use model::prelude::*;
+use crate::model::prelude::*;
 use chrono::{DateTime, FixedOffset};
 use std::fmt::{
     Display,
@@ -8,15 +8,15 @@ use std::fmt::{
 use super::deserialize_sync_user;
 
 #[cfg(all(feature = "builder", feature = "cache", feature = "model"))]
-use builder::EditMember;
+use crate::builder::EditMember;
 #[cfg(all(feature = "cache", feature = "model"))]
-use internal::prelude::*;
+use crate::internal::prelude::*;
 #[cfg(feature = "model")]
 use std::borrow::Cow;
 #[cfg(all(feature = "cache", feature = "model", feature = "utils"))]
-use utils::Colour;
+use crate::utils::Colour;
 #[cfg(all(feature = "cache", feature = "model"))]
-use {CACHE, http, utils};
+use crate::{CACHE, http, utils};
 
 /// A trait for allowing both u8 or &str or (u8, &str) to be passed into the `ban` methods in `Guild` and `Member`.
 pub trait BanOptions {
diff --git a/src/model/guild/mod.rs b/src/model/guild/mod.rs
index 3f1baad..86cba3d 100644
--- a/src/model/guild/mod.rs
+++ b/src/model/guild/mod.rs
@@ -17,19 +17,19 @@ pub use self::role::*;
 pub use self::audit_log::*;
 
 use chrono::{DateTime, FixedOffset};
-use model::prelude::*;
+use crate::model::prelude::*;
 use serde::de::Error as DeError;
 use serde_json;
 use super::utils::*;
 
 #[cfg(all(feature = "cache", feature = "model"))]
-use CACHE;
+use crate::CACHE;
 #[cfg(feature = "model")]
-use http;
+use crate::http;
 #[cfg(feature = "model")]
-use builder::{EditGuild, EditMember, EditRole};
+use crate::builder::{EditGuild, EditMember, EditRole};
 #[cfg(feature = "model")]
-use constants::LARGE_THRESHOLD;
+use crate::constants::LARGE_THRESHOLD;
 #[cfg(feature = "model")]
 use std;
 #[cfg(feature = "model")]
@@ -1722,7 +1722,7 @@ fn closest_to_origin(origin: &str, word_a: &str, word_b: &str) -> std::cmp::Orde
 ///
 /// This is used to differentiate whether a guild itself can be used or whether
 /// a guild needs to be retrieved from the cache.
-#[allow(large_enum_variant)]
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug)]
 pub enum GuildContainer {
     /// A guild which can have its contents directly searched.
@@ -1812,7 +1812,7 @@ pub struct GuildUnavailable {
     pub unavailable: bool,
 }
 
-#[allow(large_enum_variant)]
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum GuildStatus {
@@ -2007,7 +2007,7 @@ mod test {
     #[cfg(feature = "model")]
     mod model {
         use chrono::prelude::*;
-        use model::prelude::*;
+        use crate::model::prelude::*;
         use std::collections::*;
         use std::sync::Arc;
 
diff --git a/src/model/guild/partial_guild.rs b/src/model/guild/partial_guild.rs
index 38f4d53..6276db2 100644
--- a/src/model/guild/partial_guild.rs
+++ b/src/model/guild/partial_guild.rs
@@ -1,8 +1,8 @@
-use model::prelude::*;
+use crate::model::prelude::*;
 use super::super::utils::{deserialize_emojis, deserialize_roles};
 
 #[cfg(feature = "model")]
-use builder::{EditGuild, EditMember, EditRole};
+use crate::builder::{EditGuild, EditMember, EditRole};
 
 /// Partial information about a [`Guild`]. This does not include information
 /// like member data.
diff --git a/src/model/guild/role.rs b/src/model/guild/role.rs
index 5aa5fbb..b68803b 100644
--- a/src/model/guild/role.rs
+++ b/src/model/guild/role.rs
@@ -1,19 +1,19 @@
-use model::prelude::*;
+use crate::model::prelude::*;
 use std::cmp::Ordering;
 
 #[cfg(all(feature = "builder", feature = "cache", feature = "model"))]
-use builder::EditRole;
+use crate::builder::EditRole;
 #[cfg(all(feature = "cache", feature = "model"))]
-use internal::prelude::*;
+use crate::internal::prelude::*;
 #[cfg(all(feature = "cache", feature = "model"))]
-use {CACHE, Cache, http};
+use crate::{CACHE, Cache, http};
 
 #[cfg(all(feature = "cache", feature = "model", feature = "utils"))]
 use std::str::FromStr;
 #[cfg(all(feature = "cache", feature = "model", feature = "utils"))]
-use model::misc::RoleParseError;
+use crate::model::misc::RoleParseError;
 #[cfg(all(feature = "cache", feature = "model", feature = "utils"))]
-use utils::parse_role;
+use crate::utils::parse_role;
 
 /// 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
diff --git a/src/model/id.rs b/src/model/id.rs
index a153d3b..d237805 100644
--- a/src/model/id.rs
+++ b/src/model/id.rs
@@ -1,7 +1,7 @@
 //! A collection of newtypes defining type-strong IDs.
 
 use chrono::NaiveDateTime;
-use internal::prelude::*;
+use crate::internal::prelude::*;
 use serde::de::{Deserialize, Deserializer};
 use std::fmt::{Display, Formatter, Result as FmtResult};
 use super::utils::U64Visitor;
@@ -80,52 +80,52 @@ macro_rules! id_u64 {
 
 /// An identifier for an Application.
 #[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialOrd, Ord, Serialize)]
-#[allow(derive_hash_xor_eq)]
+#[allow(clippy::derive_hash_xor_eq)]
 pub struct ApplicationId(pub u64);
 
 /// An identifier for a Channel
 #[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialOrd, Ord, Serialize)]
-#[allow(derive_hash_xor_eq)]
+#[allow(clippy::derive_hash_xor_eq)]
 pub struct ChannelId(pub u64);
 
 /// An identifier for an Emoji
 #[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialOrd, Ord, Serialize)]
-#[allow(derive_hash_xor_eq)]
+#[allow(clippy::derive_hash_xor_eq)]
 pub struct EmojiId(pub u64);
 
 /// An identifier for a Guild
 #[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialOrd, Ord, Serialize)]
-#[allow(derive_hash_xor_eq)]
+#[allow(clippy::derive_hash_xor_eq)]
 pub struct GuildId(pub u64);
 
 /// An identifier for an Integration
 #[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialOrd, Ord, Serialize)]
-#[allow(derive_hash_xor_eq)]
+#[allow(clippy::derive_hash_xor_eq)]
 pub struct IntegrationId(pub u64);
 
 /// An identifier for a Message
 #[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialOrd, Ord, Serialize)]
-#[allow(derive_hash_xor_eq)]
+#[allow(clippy::derive_hash_xor_eq)]
 pub struct MessageId(pub u64);
 
 /// An identifier for a Role
 #[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialOrd, Ord, Serialize)]
-#[allow(derive_hash_xor_eq)]
+#[allow(clippy::derive_hash_xor_eq)]
 pub struct RoleId(pub u64);
 
 /// An identifier for a User
 #[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialOrd, Ord, Serialize)]
-#[allow(derive_hash_xor_eq)]
+#[allow(clippy::derive_hash_xor_eq)]
 pub struct UserId(pub u64);
 
 /// An identifier for a [`Webhook`](../webhook/struct.Webhook.html).
 #[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialOrd, Ord, Serialize)]
-#[allow(derive_hash_xor_eq)]
+#[allow(clippy::derive_hash_xor_eq)]
 pub struct WebhookId(pub u64);
 
 /// An identifier for an audit log entry.
 #[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialOrd, Ord, Serialize)]
-#[allow(derive_hash_xor_eq)]
+#[allow(clippy::derive_hash_xor_eq)]
 pub struct AuditLogEntryId(pub u64);
 
 id_u64! {
diff --git a/src/model/invite.rs b/src/model/invite.rs
index b391f9b..74a46dc 100644
--- a/src/model/invite.rs
+++ b/src/model/invite.rs
@@ -4,13 +4,13 @@ use chrono::{DateTime, FixedOffset};
 use super::prelude::*;
 
 #[cfg(feature = "model")]
-use builder::CreateInvite;
+use crate::builder::CreateInvite;
 #[cfg(feature = "model")]
-use internal::prelude::*;
+use crate::internal::prelude::*;
 #[cfg(all(feature = "cache", feature = "model"))]
 use super::{Permissions, utils as model_utils};
 #[cfg(feature = "model")]
-use {http, utils};
+use crate::{http, utils};
 
 /// Information about an invite code.
 ///
@@ -117,13 +117,13 @@ impl Invite {
     }
 
     /// Gets the information about an invite.
-    #[allow(unused_mut)]
+    #[allow(clippy::unused_mut)]
     pub fn get(code: &str, stats: bool) -> Result<Invite> {
         let mut invite = code;
 
         #[cfg(feature = "utils")]
         {
-            invite = ::utils::parse_invite(invite);
+            invite = crate::utils::parse_invite(invite);
         }
 
         http::get_invite(invite, stats)
diff --git a/src/model/misc.rs b/src/model/misc.rs
index 87c3c44..e2adbcc 100644
--- a/src/model/misc.rs
+++ b/src/model/misc.rs
@@ -1,7 +1,7 @@
 //! Miscellaneous helper traits, enums, and structs for models.
 
 use super::prelude::*;
-use internal::RwLockExt;
+use crate::internal::RwLockExt;
 
 #[cfg(all(feature = "model", feature = "utils"))]
 use std::error::Error as StdError;
@@ -12,7 +12,7 @@ use std::str::FromStr;
 #[cfg(all(feature = "model", feature = "utils"))]
 use std::fmt;
 #[cfg(all(feature = "model", any(feature = "cache", feature = "utils")))]
-use utils;
+use crate::utils;
 
 /// Allows something - such as a channel or role - to be mentioned in a message.
 pub trait Mentionable {
@@ -296,7 +296,7 @@ pub struct Maintenance {
 
 #[cfg(test)]
 mod test {
-    use model::prelude::*;
+    use crate::model::prelude::*;
 
     #[test]
     fn test_formatters() {
@@ -309,10 +309,10 @@ mod test {
 
     #[cfg(feature = "utils")]
     mod utils {
-        use model::prelude::*;
+        use crate::model::prelude::*;
         use parking_lot::RwLock;
         use std::sync::Arc;
-        use utils::Colour;
+        use crate::utils::Colour;
 
         #[test]
         fn test_mention() {
diff --git a/src/model/mod.rs b/src/model/mod.rs
index 8afa79c..a614f63 100644
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@@ -40,7 +40,7 @@ pub mod webhook;
 pub use self::error::Error as ModelError;
 pub use self::permissions::Permissions;
 
-use internal::prelude::*;
+use crate::internal::prelude::*;
 use parking_lot::RwLock;
 use self::utils::*;
 use serde::de::Visitor;
@@ -56,6 +56,6 @@ use std::{
 };
 
 #[cfg(feature = "utils")]
-use utils::Colour;
+use crate::utils::Colour;
 
 use serde::{Deserialize, Deserializer};
diff --git a/src/model/user.rs b/src/model/user.rs
index 5676fd1..057f57b 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -4,17 +4,17 @@ use serde_json;
 use std::fmt;
 use super::utils::deserialize_u16;
 use super::prelude::*;
-use internal::prelude::*;
-use model::misc::Mentionable;
+use crate::internal::prelude::*;
+use crate::model::misc::Mentionable;
 
 #[cfg(all(feature = "cache", feature = "model"))]
-use CACHE;
+use crate::CACHE;
 #[cfg(feature = "model")]
-use builder::{CreateMessage, EditProfile};
+use crate::builder::{CreateMessage, EditProfile};
 #[cfg(feature = "model")]
 use chrono::NaiveDateTime;
 #[cfg(feature = "model")]
-use http::{self, GuildPagination};
+use crate::http::{self, GuildPagination};
 #[cfg(all(feature = "cache", feature = "model"))]
 use parking_lot::RwLock;
 #[cfg(feature = "model")]
@@ -24,7 +24,7 @@ use std::mem;
 #[cfg(all(feature = "cache", feature = "model"))]
 use std::sync::Arc;
 #[cfg(feature = "model")]
-use utils::{self, VecMap};
+use crate::utils::{self, VecMap};
 
 /// Information about the current user.
 #[derive(Clone, Default, Debug, Deserialize, Serialize)]
@@ -481,7 +481,7 @@ impl User {
     // The universe is still fine, and nothing implodes.
     //
     // (AKA: Clippy is wrong and so we have to mark as allowing this lint.)
-    #[allow(let_and_return)]
+    #[allow(clippy::let_and_return)]
     #[cfg(feature = "builder")]
     pub fn direct_message<F>(&self, f: F) -> Result<Message>
         where for <'b> F: FnOnce(&'b mut CreateMessage<'b>) -> &'b mut CreateMessage<'b> {
@@ -885,8 +885,8 @@ fn tag(name: &str, discriminator: u16) -> String {
 mod test {
     #[cfg(feature = "model")]
     mod model {
-        use model::id::UserId;
-        use model::user::User;
+        use crate::model::id::UserId;
+        use crate::model::user::User;
 
         fn gen() -> User {
             User {
diff --git a/src/model/utils.rs b/src/model/utils.rs
index f057047..2399db3 100644
--- a/src/model/utils.rs
+++ b/src/model/utils.rs
@@ -9,12 +9,12 @@ use std::{
 use super::prelude::*;
 
 #[cfg(feature = "cache")]
-use internal::prelude::*;
+use crate::internal::prelude::*;
 
 #[cfg(all(feature = "cache", feature = "model"))]
 use super::permissions::Permissions;
 #[cfg(all(feature = "cache", feature = "model"))]
-use CACHE;
+use crate::CACHE;
 
 pub fn default_true() -> bool {
     true
diff --git a/src/model/webhook.rs b/src/model/webhook.rs
index b87bef8..7134765 100644
--- a/src/model/webhook.rs
+++ b/src/model/webhook.rs
@@ -10,15 +10,15 @@ use super::{
 };
 
 #[cfg(feature = "model")]
-use builder::ExecuteWebhook;
+use crate::builder::ExecuteWebhook;
 #[cfg(feature = "model")]
-use internal::prelude::*;
+use crate::internal::prelude::*;
 #[cfg(feature = "model")]
 use std::mem;
 #[cfg(feature = "model")]
 use super::channel::Message;
 #[cfg(feature = "model")]
-use {http, utils};
+use crate::{http, utils};
 
 /// A representation of a webhook, which is a low-effort way to post messages to
 /// channels. They do not necessarily require a bot user or authentication to