aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/network
diff options
context:
space:
mode:
authorGustav Sörnäs <gustav@sornas.net>2021-03-30 10:16:15 +0200
committerGustav Sörnäs <gustav@sornas.net>2021-03-30 10:16:15 +0200
commitf81e8a403d6317803a23ba0d43c862e0cfea52ef (patch)
tree6d82abf1c44be6ac16b150b027e492e1189ac6da /mumd/src/network
parent7fa6078759b095a0ffb5ede05a933249833c9e6f (diff)
downloadmum-f81e8a403d6317803a23ba0d43c862e0cfea52ef.tar.gz
mumlib: re-export error
Diffstat (limited to 'mumd/src/network')
-rw-r--r--mumd/src/network/tcp.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs
index fb5869d..bf16110 100644
--- a/mumd/src/network/tcp.rs
+++ b/mumd/src/network/tcp.rs
@@ -8,7 +8,6 @@ use mumble_protocol::control::{msgs, ClientControlCodec, ControlCodec, ControlPa
use mumble_protocol::crypt::ClientCryptState;
use mumble_protocol::voice::VoicePacket;
use mumble_protocol::{Clientbound, Serverbound};
-use mumlib::error::Error;
use std::collections::HashMap;
use std::convert::{Into, TryInto};
use std::net::SocketAddr;
@@ -39,7 +38,7 @@ pub enum TcpEvent {
#[derive(Clone)]
pub enum TcpEventData<'a> {
- Connected(Result<&'a msgs::ServerSync, Error>),
+ Connected(Result<&'a msgs::ServerSync, mumlib::Error>),
_Disconnected,
}
@@ -317,7 +316,7 @@ async fn listen(
debug!("Login rejected: {:?}", msg);
match msg.get_field_type() {
msgs::Reject_RejectType::WrongServerPW => {
- event_queue.send(TcpEventData::Connected(Err(Error::InvalidServerPassword))).await;
+ event_queue.send(TcpEventData::Connected(Err(mumlib::Error::InvalidServerPassword))).await;
}
ty => {
warn!("Unhandled reject type: {:?}", ty);