aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.toml1
-rw-r--r--src/format/binary.rs4
-rw-r--r--src/format/msgpack.rs3
-rw-r--r--src/lib.rs7
4 files changed, 9 insertions, 6 deletions
diff --git a/Cargo.toml b/Cargo.toml
index dfbd9b1..7978cd7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,6 +21,7 @@ bincode = "*"
combine = "*"
glob = "*"
rmp = "*"
+rmp-serialize = "*"
blist = "*"
[profile.release]
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)
}