Track latest changes to tokio-proto.

This commit is contained in:
Tim Kuehn
2016-12-03 17:00:12 -08:00
parent 608be5372b
commit 13e56481bb
17 changed files with 283 additions and 273 deletions

View File

@@ -3,7 +3,7 @@
// Licensed under the MIT License, <LICENSE or http://opensource.org/licenses/MIT>.
// This file may not be copied, modified, or distributed except according to those terms.
use {bincode, tokio_proto as proto};
use bincode;
use serde::{Deserialize, Serialize};
use std::{fmt, io};
use std::error::Error as StdError;
@@ -75,15 +75,6 @@ impl<E: SerializableError> StdError for Error<E> {
}
}
impl<E> From<proto::Error<Error<E>>> for Error<E> {
fn from(err: proto::Error<Error<E>>) -> Self {
match err {
proto::Error::Transport(e) => e,
proto::Error::Io(e) => e.into(),
}
}
}
impl<E> From<io::Error> for Error<E> {
fn from(err: io::Error) -> Self {
Error::Io(err)