aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2018-01-10 12:42:17 -0800
committerZeyla Hellyer <[email protected]>2018-01-10 12:42:17 -0800
commit8f5dc8884044fccf09855d17eee342b71fe18503 (patch)
tree1ccb8313442810e8e9e9e71e628d84b818af1254 /src
parentAdd `Client::user_id` (diff)
downloadserenity-8f5dc8884044fccf09855d17eee342b71fe18503.tar.xz
serenity-8f5dc8884044fccf09855d17eee342b71fe18503.zip
Fix no-model compiler warnings
Diffstat (limited to 'src')
-rw-r--r--src/model/guild/emoji.rs2
-rw-r--r--src/model/mod.rs1
-rw-r--r--src/model/webhook.rs3
3 files changed, 3 insertions, 3 deletions
diff --git a/src/model/guild/emoji.rs b/src/model/guild/emoji.rs
index a4612f0..23a174d 100644
--- a/src/model/guild/emoji.rs
+++ b/src/model/guild/emoji.rs
@@ -8,7 +8,7 @@ use std::mem;
#[cfg(all(feature = "cache", feature = "model"))]
use super::super::ModelError;
#[cfg(all(feature = "cache", feature = "model"))]
-use super::super::GuildId;
+use super::super::id::GuildId;
#[cfg(all(feature = "cache", feature = "model"))]
use {CACHE, http};
diff --git a/src/model/mod.rs b/src/model/mod.rs
index 6ecf343..5e35e92 100644
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@@ -42,7 +42,6 @@ pub use self::permissions::Permissions;
use internal::prelude::*;
use parking_lot::RwLock;
-use self::id::GuildId;
use self::utils::*;
use serde::de::Visitor;
use std::collections::HashMap;
diff --git a/src/model/webhook.rs b/src/model/webhook.rs
index 8b9d0f2..0d6b7c9 100644
--- a/src/model/webhook.rs
+++ b/src/model/webhook.rs
@@ -1,6 +1,5 @@
//! Webhook model and implementations.
-use super::channel::Message;
use super::id::{ChannelId, GuildId, WebhookId};
use super::user::User;
@@ -11,6 +10,8 @@ use internal::prelude::*;
#[cfg(feature = "model")]
use std::mem;
#[cfg(feature = "model")]
+use super::channel::Message;
+#[cfg(feature = "model")]
use {http, utils};
/// A representation of a webhook, which is a low-effort way to post messages to