diff --git a/Cargo.toml b/Cargo.toml index ab22bcb..f8522d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/src/main.rs b/src/main.rs index 24f3c9b..05c18a6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -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; diff --git a/src/message.rs b/src/message.rs index 122dc6d..67b72bd 100644 --- a/src/message.rs +++ b/src/message.rs @@ -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, } @@ -155,14 +155,14 @@ impl fmt::Display for Error { } } -impl From for Error { - fn from(err: msgpack::encode::serialize::Error) -> Error { +impl From for Error { + fn from(err: msgpack::encode::Error) -> Error { Error::EncodeError(err) } } -impl From for Error { - fn from(err: msgpack::decode::serialize::Error) -> Error { +impl From for Error { + fn from(err: msgpack::decode::Error) -> Error { Error::DecodeError(err) } }