chore: remove deprecated `description()`

Fixes #111
pull/115/head
Daniel Abramov 5 years ago
parent 431b6d9241
commit 0c429cba94
  1. 24
      src/error.rs
  2. 9
      src/handshake/mod.rs

@ -1,7 +1,6 @@
//! Error handling. //! Error handling.
use std::borrow::{Borrow, Cow}; use std::borrow::Cow;
use std::error::Error as ErrorTrait; use std::error::Error as ErrorTrait;
use std::fmt; use std::fmt;
use std::io; use std::io;
@ -89,24 +88,7 @@ impl fmt::Display for Error {
} }
} }
impl ErrorTrait for Error { impl ErrorTrait for Error {}
fn description(&self) -> &str {
match *self {
Error::ConnectionClosed => "A close handshake is performed",
Error::AlreadyClosed => "Trying to read or write after getting close notification",
Error::Io(ref err) => err.description(),
#[cfg(feature = "tls")]
Error::Tls(ref err) => err.description(),
Error::Capacity(ref msg) => msg.borrow(),
Error::Protocol(ref msg) => msg.borrow(),
Error::SendQueueFull(_) => "Send queue is full",
Error::Utf8 => "",
Error::Url(ref msg) => msg.borrow(),
Error::Http(_) => "",
Error::HttpFormat(ref err) => err.description(),
}
}
}
impl From<io::Error> for Error { impl From<io::Error> for Error {
fn from(err: io::Error) -> Self { fn from(err: io::Error) -> Self {
@ -173,7 +155,7 @@ impl From<httparse::Error> for Error {
fn from(err: httparse::Error) -> Self { fn from(err: httparse::Error) -> Self {
match err { match err {
httparse::Error::TooManyHeaders => Error::Capacity("Too many headers".into()), httparse::Error::TooManyHeaders => Error::Capacity("Too many headers".into()),
e => Error::Protocol(Cow::Owned(e.description().into())), e => Error::Protocol(e.to_string().into()),
} }
} }
} }

@ -81,14 +81,7 @@ impl<Role: HandshakeRole> fmt::Display for HandshakeError<Role> {
} }
} }
impl<Role: HandshakeRole> ErrorTrait for HandshakeError<Role> { impl<Role: HandshakeRole> ErrorTrait for HandshakeError<Role> {}
fn description(&self) -> &str {
match *self {
HandshakeError::Interrupted(_) => "Interrupted handshake",
HandshakeError::Failure(ref e) => e.description(),
}
}
}
impl<Role: HandshakeRole> From<Error> for HandshakeError<Role> { impl<Role: HandshakeRole> From<Error> for HandshakeError<Role> {
fn from(err: Error) -> Self { fn from(err: Error) -> Self {

Loading…
Cancel
Save