From 75867ee8727d23e78648e9369aa83b55d10579e5 Mon Sep 17 00:00:00 2001
From: Till Höppner
Date: Wed, 13 Jan 2016 13:32:46 +0100
Subject: Updated dependencies, still doesn't build

---
 src/format/binary.rs  | 4 ++--
 src/format/msgpack.rs | 3 ++-
 src/lib.rs            | 7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src')

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)))
         }
     }
diff --git a/src/lib.rs b/src/lib.rs
index 422ca07..015af7d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -20,7 +20,8 @@ extern crate chrono;
 extern crate log as l;
 extern crate rustc_serialize;
 extern crate bincode;
-extern crate rmp as msgpack;
+extern crate rmp;
+extern crate rmp_serialize as msgpack;
 
 pub mod event;
 pub mod format;
@@ -41,8 +42,8 @@ pub enum IlcError {
     Chrono(ParseError),
     BincodeDecode,
     BincodeEncode,
-    MsgpackEncode(msgpack::encode::serialize::Error),
-    MsgpackDecode(msgpack::decode::serialize::Error),
+    MsgpackEncode(msgpack::encode::Error),
+    MsgpackDecode(msgpack::decode::Error),
     Io(io::Error)
 }
 
-- 
cgit v1.2.3