aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-06-02 08:26:24 -0700
committerZeyla Hellyer <[email protected]>2017-06-02 08:26:24 -0700
commit7a96b8a1356e50b2bff5d5e03d43361a052517c6 (patch)
treed0df182f288e959bd73f4c610c7af4f0dfacf5a8 /src/client
parentAdd User::refresh (diff)
downloadserenity-7a96b8a1356e50b2bff5d5e03d43361a052517c6.tar.xz
serenity-7a96b8a1356e50b2bff5d5e03d43361a052517c6.zip
Fix compilations across feature combinations
Diffstat (limited to 'src/client')
-rw-r--r--src/client/context.rs6
-rw-r--r--src/client/dispatch.rs3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/client/context.rs b/src/client/context.rs
index 9cb76b7..0ab4eb5 100644
--- a/src/client/context.rs
+++ b/src/client/context.rs
@@ -1,14 +1,16 @@
use std::sync::{Arc, Mutex};
use typemap::ShareMap;
use ::gateway::Shard;
-use ::http;
-use ::internal::prelude::*;
use ::model::*;
#[cfg(feature="cache")]
use super::CACHE;
#[cfg(feature="builder")]
+use ::internal::prelude::*;
+#[cfg(feature="builder")]
use ::builder::EditProfile;
+#[cfg(feature="builder")]
+use ::http;
/// The context is a general utility struct provided on event dispatches, which
/// helps with dealing with the current "context" of the event dispatch.
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index c012fda..3eda9c3 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -107,6 +107,7 @@ pub fn dispatch(event: Event,
}
}
+#[allow(unused_mut)]
fn dispatch_message(context: Context,
mut message: Message,
event_store: &Arc<RwLock<EventStore>>) {
@@ -122,7 +123,7 @@ fn dispatch_message(context: Context,
}
}
-#[allow(cyclomatic_complexity, unused_mut)]
+#[allow(cyclomatic_complexity, unused_assignments, unused_mut)]
fn handle_event(event: Event,
conn: &Arc<Mutex<Shard>>,
data: &Arc<Mutex<ShareMap>>,