diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-10-12 10:15:26 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-10-12 14:07:55 -0700 |
| commit | 9d70ff384f4a87e2cfe3d5e90b27637632bb373a (patch) | |
| tree | ef14774ca0dfd2daabeee9dad6da56be1b36106d /src/libstd/error.rs | |
| parent | d13b102c5463d4258482815d04b93f360418245f (diff) | |
| parent | 79b5177378097ee39e595517ca76132b3a3dc0eb (diff) | |
| download | rust-9d70ff384f4a87e2cfe3d5e90b27637632bb373a.tar.gz rust-9d70ff384f4a87e2cfe3d5e90b27637632bb373a.zip | |
Rollup merge of #36995 - nrc:stable, r=@nikomatsakis
stabilise ?, attributes on stmts, deprecate Reflect r? @nikomatsakis
Diffstat (limited to 'src/libstd/error.rs')
| -rw-r--r-- | src/libstd/error.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index f1f62bc24c5..398bb55ea1b 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -55,7 +55,6 @@ use any::TypeId; use cell; use char; use fmt::{self, Debug, Display}; -use marker::Reflect; use mem::transmute; use num; use str; @@ -63,7 +62,7 @@ use string; /// Base functionality for all errors in Rust. #[stable(feature = "rust1", since = "1.0.0")] -pub trait Error: Debug + Display + Reflect { +pub trait Error: Debug + Display { /// A short description of the error. /// /// The description should not contain newlines or sentence-ending |