Skip to content

Commit

Permalink
Merge pull request sfackler#1210 from AnderEnder/remove-deprecated-er…
Browse files Browse the repository at this point in the history
…ror-description

Remove deprecated Error::description and Error::cause
  • Loading branch information
sfackler authored Dec 22, 2019
2 parents 0815ac9 + fc3c0a9 commit abc46f5
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 33 deletions.
12 changes: 2 additions & 10 deletions openssl/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,7 @@ impl fmt::Display for ErrorStack {
}
}

impl error::Error for ErrorStack {
fn description(&self) -> &str {
"An OpenSSL error stack"
}
}
impl error::Error for ErrorStack {}

impl From<ErrorStack> for io::Error {
fn from(e: ErrorStack) -> io::Error {
Expand Down Expand Up @@ -285,8 +281,4 @@ impl fmt::Display for Error {
}
}

impl error::Error for Error {
fn description(&self) -> &str {
"an OpenSSL error"
}
}
impl error::Error for Error {}
30 changes: 12 additions & 18 deletions openssl/src/ssl/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,7 @@ impl fmt::Display for Error {
}

impl error::Error for Error {
fn description(&self) -> &str {
"an OpenSSL error"
}

fn cause(&self) -> Option<&dyn error::Error> {
fn source(&self) -> Option<&(dyn error::Error + 'static)> {
match self.cause {
Some(InnerError::Io(ref e)) => Some(e),
Some(InnerError::Ssl(ref e)) => Some(e),
Expand All @@ -151,15 +147,7 @@ pub enum HandshakeError<S> {
}

impl<S: fmt::Debug> StdError for HandshakeError<S> {
fn description(&self) -> &str {
match *self {
HandshakeError::SetupFailure(_) => "stream setup failed",
HandshakeError::Failure(_) => "the handshake failed",
HandshakeError::WouldBlock(_) => "the handshake was interrupted",
}
}

fn cause(&self) -> Option<&dyn StdError> {
fn source(&self) -> Option<&(dyn StdError + 'static)> {
match *self {
HandshakeError::SetupFailure(ref e) => Some(e),
HandshakeError::Failure(ref s) | HandshakeError::WouldBlock(ref s) => Some(s.error()),
Expand All @@ -169,11 +157,17 @@ impl<S: fmt::Debug> StdError for HandshakeError<S> {

impl<S: fmt::Debug> fmt::Display for HandshakeError<S> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str(StdError::description(self))?;
match *self {
HandshakeError::SetupFailure(ref e) => write!(f, ": {}", e)?,
HandshakeError::Failure(ref s) | HandshakeError::WouldBlock(ref s) => {
write!(f, ": {}", s.error())?;
HandshakeError::SetupFailure(ref e) => write!(f, "stream setup failed: {}", e)?,
HandshakeError::Failure(ref s) => {
write!(f, "the handshake failed: {}", s.error())?;
let verify = s.ssl().verify_result();
if verify != X509VerifyResult::OK {
write!(f, ": {}", verify)?;
}
}
HandshakeError::WouldBlock(ref s) => {
write!(f, "the handshake was interrupted: {}", s.error())?;
let verify = s.ssl().verify_result();
if verify != X509VerifyResult::OK {
write!(f, ": {}", verify)?;
Expand Down
6 changes: 1 addition & 5 deletions openssl/src/x509/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1189,11 +1189,7 @@ impl fmt::Display for X509VerifyResult {
}
}

impl Error for X509VerifyResult {
fn description(&self) -> &str {
"an X509 validation error"
}
}
impl Error for X509VerifyResult {}

impl X509VerifyResult {
/// Creates an `X509VerifyResult` from a raw error number.
Expand Down

0 comments on commit abc46f5

Please sign in to comment.