Skip to content

Commit

Permalink
Update msgpack-rust
Browse files Browse the repository at this point in the history
  • Loading branch information
hibariya committed Oct 25, 2015
1 parent fa7e0ae commit ad5d391
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ keywords = ["terminal", "tool"]
[dependencies]
docopt='0.6'
libc='0.1.8'
nix="0.3.9"
pty='0.1.5'
rmp-serialize = "0.7"
rustc-serialize='0.3'
termios='0.2.0'
rmp = "0.6"
nix="0.3.9"
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ extern crate docopt;
extern crate libc;
extern crate nix;
extern crate pty;
extern crate rmp as msgpack;
extern crate rmp_serialize as msgpack;
extern crate rustc_serialize;
extern crate termios;

Expand Down
12 changes: 6 additions & 6 deletions src/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ pub enum Notification {

#[derive(Debug)]
pub enum Error {
EncodeError(msgpack::encode::serialize::Error),
DecodeError(msgpack::decode::serialize::Error),
EncodeError(msgpack::encode::Error),
DecodeError(msgpack::decode::Error),
UnknownMessage,
}

Expand Down Expand Up @@ -155,14 +155,14 @@ impl fmt::Display for Error {
}
}

impl From<msgpack::encode::serialize::Error> for Error {
fn from(err: msgpack::encode::serialize::Error) -> Error {
impl From<msgpack::encode::Error> for Error {
fn from(err: msgpack::encode::Error) -> Error {
Error::EncodeError(err)
}
}

impl From<msgpack::decode::serialize::Error> for Error {
fn from(err: msgpack::decode::serialize::Error) -> Error {
impl From<msgpack::decode::Error> for Error {
fn from(err: msgpack::decode::Error) -> Error {
Error::DecodeError(err)
}
}

0 comments on commit ad5d391

Please sign in to comment.