aboutsummaryrefslogtreecommitdiff
path: root/src/format
diff options
context:
space:
mode:
authorTill Höppner2016-01-13 13:32:46 +0100
committerTill Höppner2016-01-13 13:32:46 +0100
commit75867ee8727d23e78648e9369aa83b55d10579e5 (patch)
treec57f31177fd27e61b0851a9948e26dfb9c86e69f /src/format
parent25b2ed76faf6d55455dec3b90096faa01816f52d (diff)
downloadilc-75867ee8727d23e78648e9369aa83b55d10579e5.tar.gz
ilc-75867ee8727d23e78648e9369aa83b55d10579e5.tar.xz
ilc-75867ee8727d23e78648e9369aa83b55d10579e5.zip
Updated dependencies, still doesn't build
Diffstat (limited to 'src/format')
-rw-r--r--src/format/binary.rs4
-rw-r--r--src/format/msgpack.rs3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/format/binary.rs b/src/format/binary.rs
index a1ca12d..367cdf9 100644
--- a/src/format/binary.rs
+++ b/src/format/binary.rs
@@ -32,14 +32,14 @@ pub struct Iter<'a, R: 'a> where R: BufRead {
impl<'a, R: 'a> Iterator for Iter<'a, R> where R: BufRead {
type Item = ::Result<Event<'a>>;
fn next(&mut self) -> Option<::Result<Event<'a>>> {
- Some(bincode::decode_from::<R, Event>(&mut self.input, SizeLimit::Infinite)
+ Some(bincode::rustc_serialize::decode_from::<R, Event>(&mut self.input, SizeLimit::Infinite)
.map_err(|_| ::IlcError::BincodeDecode))
}
}
impl<'a, W> Encode<'a, W> for Binary where W: Write {
fn encode(&'a self, _context: &'a Context, mut output: W, event: &'a Event) -> ::Result<()> {
- bincode::encode_into(event, &mut output, SizeLimit::Infinite)
+ bincode::rustc_serialize::encode_into(event, &mut output, SizeLimit::Infinite)
.map_err(|_| ::IlcError::BincodeEncode)
}
}
diff --git a/src/format/msgpack.rs b/src/format/msgpack.rs
index 09bd2bb..fb71b99 100644
--- a/src/format/msgpack.rs
+++ b/src/format/msgpack.rs
@@ -22,6 +22,7 @@ use format::{ Encode, Decode };
use rustc_serialize::{ Encodable, Decodable };
use msgpack::{ Encoder, Decoder };
+use rmp::decode::ReadError;
pub struct Msgpack;
@@ -36,7 +37,7 @@ impl<'a, R: 'a> Iterator for Iter<'a, R> where R: BufRead {
use msgpack::decode;
match Event::decode(&mut Decoder::new(&mut self.input)) {
Ok(e) => Some(Ok(e)),
- Err(decode::serialize::Error::InvalidMarkerRead(decode::ReadError::UnexpectedEOF)) => None,
+ Err(decode::Error::InvalidMarkerRead(ReadError::UnexpectedEOF)) => None,
Err(e) => Some(Err(::IlcError::MsgpackDecode(e)))
}
}