From f81e8a403d6317803a23ba0d43c862e0cfea52ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Tue, 30 Mar 2021 10:16:15 +0200 Subject: mumlib: re-export error --- mumd/src/network/tcp.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'mumd/src/network') 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); -- cgit v1.2.1