itsscb/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2025-10-19 13:14:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/colindjk/tokio-core

Browse Source
This commit is contained in:
Alex Crichton 2016-11-22 13:07:01 -08:00
commit e970e9a79c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/io/frame.rs
View File

@ -242,7 +242,7 @@ pub trait Codec {
/// This method will encode `msg` into the byte buffer provided by `buf`. /// This method will encode `msg` into the byte buffer provided by `buf`.
/// The `buf` provided is an internal buffer of the `Framed` instance and /// The `buf` provided is an internal buffer of the `Framed` instance and
/// will be written out when possible. /// will be written out when possible.
fn encode(&mut self, msg: Self::Out, buf: &mut Vec<u8>); fn encode(&mut self, msg: Self::Out) -> Result<Vec<u8>, io::Error>;
} }
/// A unified `Stream` and `Sink` interface to an underlying `Io` object, using /// A unified `Stream` and `Sink` interface to an underlying `Io` object, using
@ -319,7 +319,7 @@ impl<T: Io, C: Codec> Sink for Framed<T, C> {
} }
} }
self.codec.encode(item, &mut self.wr); self.wr = self.codec.encode(item).unwrap();
Ok(AsyncSink::Ready) Ok(AsyncSink::Ready)
} }