syndicate-lang
/
syndicate-rs
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Adapt to changed API

This commit is contained in:
Tony Garnock-Jones 2020-05-25 15:40:28 +02:00
parent 78a45116b9
commit b72e5950bf
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/packets.rs
View File

@ -2,7 +2,7 @@ use super::V;
use super::Syndicate; use super::Syndicate;
use bytes::{Buf, buf::BufMutExt, BytesMut}; use bytes::{Buf, buf::BufMutExt, BytesMut};
use preserves::{value, ser::Serializer, value::Reader}; use preserves::{value, ser::Serializer};
use std::io; use std::io;
use std::sync::Arc; use std::sync::Arc;
use std::marker::PhantomData; use std::marker::PhantomData;
@ -46,7 +46,7 @@ pub enum S2C {
#[derive(Debug)] #[derive(Debug)]
pub enum DecodeError { pub enum DecodeError {
Read(value::decoder::Error), Read(io::Error),
Parse(value::error::Error<Syndicate>, V), Parse(value::error::Error<Syndicate>, V),
} }
@ -69,7 +69,7 @@ impl std::error::Error for DecodeError {
#[derive(Debug)] #[derive(Debug)]
pub enum EncodeError { pub enum EncodeError {
Write(value::encoder::Error), Write(io::Error),
Unparse(value::error::Error<Syndicate>), Unparse(value::error::Error<Syndicate>),
} }
@ -148,9 +148,8 @@ impl<InT: serde::de::DeserializeOwned, OutT> tokio_util::codec::Decoder for Code
None => Ok(None), None => Ok(None),
Some(res) => { Some(res) => {
let v = res?; let v = res?;
let buffered_len = d.read.buffered_len()?;
let final_len = buf.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) { match value::from_value(&v) {
Ok(p) => Ok(Some(p)), Ok(p) => Ok(Some(p)),
Err(e) => Err(DecodeError::Parse(e, v)) Err(e) => Err(DecodeError::Parse(e, v))