diff --git a/src/packets.rs b/src/packets.rs index e9d2aa5..292fe9e 100644 --- a/src/packets.rs +++ b/src/packets.rs @@ -2,7 +2,7 @@ use super::V; use super::Syndicate; use bytes::{Buf, buf::BufMutExt, BytesMut}; -use preserves::{value, ser::Serializer, value::Reader}; +use preserves::{value, ser::Serializer}; use std::io; use std::sync::Arc; use std::marker::PhantomData; @@ -46,7 +46,7 @@ pub enum S2C { #[derive(Debug)] pub enum DecodeError { - Read(value::decoder::Error), + Read(io::Error), Parse(value::error::Error, V), } @@ -69,7 +69,7 @@ impl std::error::Error for DecodeError { #[derive(Debug)] pub enum EncodeError { - Write(value::encoder::Error), + Write(io::Error), Unparse(value::error::Error), } @@ -148,9 +148,8 @@ impl tokio_util::codec::Decoder for Code None => Ok(None), Some(res) => { let v = res?; - let buffered_len = d.read.buffered_len()?; let final_len = buf.len(); - bs.advance(orig_len - final_len - buffered_len); + bs.advance(orig_len - final_len); match value::from_value(&v) { Ok(p) => Ok(Some(p)), Err(e) => Err(DecodeError::Parse(e, v))