min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #926 from sfackler/clean-errors 

Improve error Display impls
This commit is contained in:
Steven Fackler 2018-05-20 20:28:48 -07:00 committed by GitHub
parent 83f6a24026 f0347fbce8
commit 41b0520416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openssl/src/ssl/error.rs
View File

@ -99,17 +99,18 @@ impl fmt::Display for Error {
Some(_) => fmt.write_str("a nonblocking read call would have blocked"), Some(_) => fmt.write_str("a nonblocking read call would have blocked"),
None => fmt.write_str("the operation should be retried"), None => fmt.write_str("the operation should be retried"),
}, },
ErrorCode::WANT_WRITE => match self.io_error() {
Some(_) => fmt.write_str("a nonblocking write call would have blocked"),
None => fmt.write_str("the operation should be retried"),
},
ErrorCode::SYSCALL => match self.io_error() { ErrorCode::SYSCALL => match self.io_error() {
Some(err) => write!(fmt, "the inner stream returned an error: {}", err), Some(err) => write!(fmt, "{}", err),
None => fmt.write_str("unexpected EOF"), None => fmt.write_str("unexpected EOF"),
}, },
ErrorCode::SSL => { ErrorCode::SSL => match self.ssl_error() {
fmt.write_str("OpenSSL error")?; Some(e) => write!(fmt, "{}", e),
if let Some(ref err) = self.ssl_error() { None => fmt.write_str("OpenSSL error"),
write!(fmt, ": {}", err)? },
}
Ok(())
}
ErrorCode(code) => write!(fmt, "unknown error code {}", code), ErrorCode(code) => write!(fmt, "unknown error code {}", code),
} }
} }