fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-28 01:01:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix concerns

Browse Source
This commit is contained in:
Pierre Krieger
2017-12-18 12:33:59 +01:00
parent 2b4dcdc756
commit 39b0b56186
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
multistream-select/src/protocol/error.rs
View File

@ -22,14 +22,14 @@
use std::error; use std::error;
use std::fmt; use std::fmt;
use std::io::Error as IoError; use std::io;
use varint::Error as VarIntError; use varint;
/// Error at the multistream-select layer of communication. /// Error at the multistream-select layer of communication.
#[derive(Debug)] #[derive(Debug)]
pub enum MultistreamSelectError { pub enum MultistreamSelectError {
/// I/O error. /// I/O error.
IoError(IoError), IoError(io::Error),
/// The remote doesn't use the same multistream-select protocol as we do. /// The remote doesn't use the same multistream-select protocol as we do.
FailedHandshake, FailedHandshake,
@ -42,20 +42,20 @@ pub enum MultistreamSelectError {
/// Failure to parse variable-length integer. /// Failure to parse variable-length integer.
// TODO: we don't include the actual error, because that would remove Send from the enum // TODO: we don't include the actual error, because that would remove Send from the enum
VarIntParseError, VarintParseError(String),
} }
impl From<IoError> for MultistreamSelectError { impl From<io::Error> for MultistreamSelectError {
#[inline] #[inline]
fn from(err: IoError) -> MultistreamSelectError { fn from(err: io::Error) -> MultistreamSelectError {
MultistreamSelectError::IoError(err) MultistreamSelectError::IoError(err)
} }
} }
impl From<VarIntError> for MultistreamSelectError { impl From<varint::Error> for MultistreamSelectError {
#[inline] #[inline]
fn from(_err: VarIntError) -> MultistreamSelectError { fn from(err: varint::Error) -> MultistreamSelectError {
MultistreamSelectError::VarIntParseError MultistreamSelectError::VarintParseError(err.to_string())
} }
} }
@ -75,7 +75,7 @@ impl error::Error for MultistreamSelectError {
MultistreamSelectError::WrongProtocolName => { MultistreamSelectError::WrongProtocolName => {
"protocol names must always start with `/`, otherwise this error is returned" "protocol names must always start with `/`, otherwise this error is returned"
}, },
MultistreamSelectError::VarIntParseError => { MultistreamSelectError::VarintParseError(_) => {
"failure to parse variable-length integer" "failure to parse variable-length integer"
}, },
} }