diff options
| author | bors <bors@rust-lang.org> | 2015-01-20 23:03:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-20 23:03:09 +0000 |
| commit | 29bd9a06efd2f8c8a7b1102e2203cc0e6ae2dcba (patch) | |
| tree | 98824cc18b1c65ff09f383438d79ad2d0a0e2ea8 /src/libstd/error.rs | |
| parent | 583c5c589ed02e5b6b14a576e35e0ce68988d949 (diff) | |
| parent | 631896dc1996d239a532b0ce02d5fe886660149e (diff) | |
| download | rust-29bd9a06efd2f8c8a7b1102e2203cc0e6ae2dcba.tar.gz rust-29bd9a06efd2f8c8a7b1102e2203cc0e6ae2dcba.zip | |
Auto merge of #21439 - alexcrichton:rollup, r=alexcrichton
Continuation of https://github.com/rust-lang/rust/pull/21428
Diffstat (limited to 'src/libstd/error.rs')
| -rw-r--r-- | src/libstd/error.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 9963e4861b7..ff128461978 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -18,7 +18,7 @@ //! chain information: //! //! ``` -//! trait Error: Send { +//! trait Error { //! fn description(&self) -> &str; //! //! fn detail(&self) -> Option<String> { None } @@ -87,7 +87,7 @@ use string::{FromUtf8Error, FromUtf16Error}; /// Base functionality for all errors in Rust. #[unstable = "the exact API of this trait may change"] -pub trait Error: Send { +pub trait Error { /// A short description of the error; usually a static string. fn description(&self) -> &str; |