From 1bed4eb5a3727e84bac4d64995df212a971f4566 Mon Sep 17 00:00:00 2001 From: Max Audron Date: Wed, 26 Feb 2025 18:23:55 +0100 Subject: refactor deserialize and serializevariant trait move stuff around a bit to sepperate it out for deserializevariant --- src/message/handshake/connack.rs | 2 +- src/message/handshake/init.rs | 2 +- src/message/handshake/protocol.rs | 2 +- src/message/handshake/types.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/message/handshake') diff --git a/src/message/handshake/connack.rs b/src/message/handshake/connack.rs index bed0cb5..d325cb9 100644 --- a/src/message/handshake/connack.rs +++ b/src/message/handshake/connack.rs @@ -41,7 +41,7 @@ impl crate::serialize::Serialize for ConnAck { } } -impl crate::deserialize::Deserialize for ConnAck { +impl crate::serialize::Deserialize for ConnAck { fn parse(b: &[u8]) -> Result<(usize, Self), ProtocolError> { let (flen, flags) = u8::parse(b)?; let (elen, extra) = i16::parse(&b[flen..])?; diff --git a/src/message/handshake/init.rs b/src/message/handshake/init.rs index 51514ff..9f011ed 100644 --- a/src/message/handshake/init.rs +++ b/src/message/handshake/init.rs @@ -1,4 +1,4 @@ -use crate::{deserialize::Deserialize, serialize::Serialize}; +use crate::serialize::{Deserialize, Serialize}; /// The first few bytes sent to the core to initialize the connection and setup if we want to use tls and compression #[derive(Clone, Debug)] diff --git a/src/message/handshake/protocol.rs b/src/message/handshake/protocol.rs index c12da05..73a82b9 100644 --- a/src/message/handshake/protocol.rs +++ b/src/message/handshake/protocol.rs @@ -1,4 +1,4 @@ -use crate::{deserialize::Deserialize, serialize::Serialize}; +use crate::serialize::{Deserialize, Serialize}; pub enum Protocol { Legacy = 0x00000001, diff --git a/src/message/handshake/types.rs b/src/message/handshake/types.rs index fd8c8fa..bebeb4c 100644 --- a/src/message/handshake/types.rs +++ b/src/message/handshake/types.rs @@ -3,8 +3,8 @@ use std::vec::Vec; use crate::error::ProtocolError; use crate::primitive::Variant; +use crate::serialize::{Deserialize, Serialize}; use crate::util; -use crate::{deserialize::Deserialize, serialize::Serialize}; use crate::message::handshake::{HandshakeDeserialize, HandshakeSerialize}; use crate::primitive::VariantMap; -- cgit v1.2.3