diff options
| author | Zeyla Hellyer <[email protected]> | 2017-12-16 13:20:08 -0800 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-12-16 13:20:08 -0800 |
| commit | 1a178fad3ce28fe2b8f1e525446570afab8f766c (patch) | |
| tree | 1fd6c36172af7643de788b2727488c20b43d4286 /src | |
| parent | Attempt to restart failed shard boots (diff) | |
| download | serenity-1a178fad3ce28fe2b8f1e525446570afab8f766c.tar.xz serenity-1a178fad3ce28fe2b8f1e525446570afab8f766c.zip | |
Fix voice feature compilation
Diffstat (limited to 'src')
| -rw-r--r-- | src/voice/connection.rs | 2 | ||||
| -rw-r--r-- | src/voice/connection_info.rs | 2 | ||||
| -rw-r--r-- | src/voice/handler.rs | 3 | ||||
| -rw-r--r-- | src/voice/manager.rs | 2 | ||||
| -rw-r--r-- | src/voice/threading.rs | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/voice/connection.rs b/src/voice/connection.rs index 9b9c68f..431084d 100644 --- a/src/voice/connection.rs +++ b/src/voice/connection.rs @@ -3,7 +3,7 @@ use internal::prelude::*; use internal::ws_impl::{ReceiverExt, SenderExt}; use internal::Timer; use model::event::VoiceEvent; -use model::UserId; +use model::id::UserId; use opus::{ packet as opus_packet, Application as CodingMode, diff --git a/src/voice/connection_info.rs b/src/voice/connection_info.rs index 91bee80..29e08be 100644 --- a/src/voice/connection_info.rs +++ b/src/voice/connection_info.rs @@ -1,4 +1,4 @@ -use model::{GuildId, UserId}; +use model::id::{GuildId, UserId}; #[derive(Clone, Debug)] pub struct ConnectionInfo { diff --git a/src/voice/handler.rs b/src/voice/handler.rs index d1ef93e..94f7c07 100644 --- a/src/voice/handler.rs +++ b/src/voice/handler.rs @@ -1,5 +1,6 @@ use constants::VoiceOpCode; -use model::{ChannelId, GuildId, UserId, VoiceState}; +use model::id::{ChannelId, GuildId, UserId}; +use model::voice::VoiceState; use serde_json::Value; use std::sync::mpsc::{self, Sender as MpscSender}; use super::connection_info::ConnectionInfo; diff --git a/src/voice/manager.rs b/src/voice/manager.rs index ffe9bbb..4b8e43e 100644 --- a/src/voice/manager.rs +++ b/src/voice/manager.rs @@ -1,4 +1,4 @@ -use model::{ChannelId, GuildId, UserId}; +use model::id::{ChannelId, GuildId, UserId}; use serde_json::Value; use std::collections::HashMap; use std::sync::mpsc::Sender as MpscSender; diff --git a/src/voice/threading.rs b/src/voice/threading.rs index 931fc91..39b72ed 100644 --- a/src/voice/threading.rs +++ b/src/voice/threading.rs @@ -1,5 +1,5 @@ use internal::Timer; -use model::GuildId; +use model::id::GuildId; use std::sync::mpsc::{Receiver as MpscReceiver, TryRecvError}; use std::thread::Builder as ThreadBuilder; use super::connection::Connection; |