Skip to content

Impl/error source #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Impl/error source #144

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5d32ec
Impl: source method for openssl error
eldesh Dec 18, 2019
b7edc59
Add: 'dyn' annotation
eldesh Dec 18, 2019
92432c9
remove: cause implementation
eldesh Dec 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/imp/openssl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,19 @@ impl error::Error for Error {
}
}

fn cause(&self) -> Option<&error::Error> {
fn cause(&self) -> Option<&dyn error::Error> {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can just remove the cause implementations - they'll delegate to source anyway.

match *self {
Error::Normal(ref e) => error::Error::cause(e),
Error::Ssl(ref e, _) => error::Error::cause(e),
}
}

fn source(&self) -> Option<&(dyn error::Error + 'static)> {
match *self {
Error::Normal(ref e) => Some(e),
Error::Ssl(ref e, _) => Some(e),
}
}
}

impl fmt::Display for Error {
Expand Down
6 changes: 5 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,13 @@ impl error::Error for Error {
error::Error::description(&self.0)
}

fn cause(&self) -> Option<&error::Error> {
fn cause(&self) -> Option<&dyn error::Error> {
error::Error::cause(&self.0)
}

fn source(&self) -> Option<&(dyn error::Error + 'static)> {
error::Error::source(&self.0)
}
}

impl fmt::Display for Error {
Expand Down