diff options
Diffstat (limited to 'src/message/handshake/clientloginack.rs')
| -rw-r--r-- | src/message/handshake/clientloginack.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/message/handshake/clientloginack.rs b/src/message/handshake/clientloginack.rs index 72dd6ac..c8650f9 100644 --- a/src/message/handshake/clientloginack.rs +++ b/src/message/handshake/clientloginack.rs @@ -2,15 +2,13 @@ use crate::error::ProtocolError; use crate::primitive::{Variant, VariantMap}; use crate::{HandshakeDeserialize, HandshakeSerialize}; -use failure::Error; - /// ClientLoginAck is received after the client has successfully logged in /// it has no fields #[derive(Debug, Clone)] pub struct ClientLoginAck; impl HandshakeSerialize for ClientLoginAck { - fn serialize(&self) -> Result<Vec<u8>, Error> { + fn serialize(&self) -> Result<Vec<u8>, ProtocolError> { let mut values: VariantMap = VariantMap::with_capacity(1); values.insert( "MsgType".to_string(), @@ -21,15 +19,15 @@ impl HandshakeSerialize for ClientLoginAck { } impl HandshakeDeserialize for ClientLoginAck { - fn parse(b: &[u8]) -> Result<(usize, Self), Error> { + fn parse(b: &[u8]) -> Result<(usize, Self), ProtocolError> { let (len, values): (usize, VariantMap) = HandshakeDeserialize::parse(b)?; let msgtype = match_variant!(&values["MsgType"], Variant::ByteArray); if msgtype == "ClientLogin" { - return Ok((len, Self {})); + Ok((len, Self {})) } else { - bail!(ProtocolError::WrongMsgType); + Err(ProtocolError::WrongMsgType) } } } |
