Skip to content

Commit

Permalink
Rollup merge of rust-lang#65366 - faern:source-on-intostringerror, r=…
Browse files Browse the repository at this point in the history
…bluss

Implement Error::source on IntoStringError + Remove superfluous cause impls

IntoStringError only implemented `Error::cause`, which is deprecated. This implemements `Error::source` instead.
`Error::cause` will still work as before, thanks to the default implementation.

I think this was the only/last `Error` impl in the standard library to have a cause, but not a source.
  • Loading branch information
Centril authored Oct 13, 2019
2 parents fad7ed0 + b8e7f76 commit a927c83
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion src/libstd/ffi/c_str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@ impl Error for IntoStringError {
"C string contained non-utf8 bytes"
}

fn cause(&self) -> Option<&dyn Error> {
fn source(&self) -> Option<&(dyn Error + 'static)> {
Some(&self.error)
}
}
Expand Down
20 changes: 0 additions & 20 deletions src/libstd/sync/mpsc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1581,10 +1581,6 @@ impl<T: Send> error::Error for SendError<T> {
fn description(&self) -> &str {
"sending on a closed channel"
}

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

#[stable(feature = "rust1", since = "1.0.0")]
Expand Down Expand Up @@ -1624,10 +1620,6 @@ impl<T: Send> error::Error for TrySendError<T> {
}
}
}

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

#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
Expand All @@ -1652,10 +1644,6 @@ impl error::Error for RecvError {
fn description(&self) -> &str {
"receiving on a closed channel"
}

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

#[stable(feature = "rust1", since = "1.0.0")]
Expand Down Expand Up @@ -1685,10 +1673,6 @@ impl error::Error for TryRecvError {
}
}
}

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

#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
Expand Down Expand Up @@ -1726,10 +1710,6 @@ impl error::Error for RecvTimeoutError {
}
}
}

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

#[stable(feature = "mpsc_error_conversions", since = "1.24.0")]
Expand Down

0 comments on commit a927c83

Please sign in to comment.