diff options
| author | David LeGare <excaliburhissheath@gmail.com> | 2017-05-05 20:35:41 -0500 |
|---|---|---|
| committer | David LeGare <excaliburhissheath@gmail.com> | 2017-05-05 20:35:41 -0500 |
| commit | d7df6dcd7399e0c49b6008ab3b82c979dba835a6 (patch) | |
| tree | e2054076d05c9f68a99f235717bd95efb72faaf9 /src/libstd/error.rs | |
| parent | e406cd1ec9abb77236318db30e362e4654411a1a (diff) | |
| parent | f4209651ec4d4455dab4fc3f3a3456a897d9da7f (diff) | |
Merge remote-tracking branch 'rust-lang/master' into iss29367-windows-docs
Diffstat (limited to 'src/libstd/error.rs')
| -rw-r--r-- | src/libstd/error.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 3d80120f6b2..9ff7d746733 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -216,7 +216,7 @@ impl<'a> From<&'a str> for Box<Error> { } } -#[stable(feature = "never_error", since = "1.18.0")] +#[unstable(feature = "never_type_impls", issue = "35121")] impl Error for ! { fn description(&self) -> &str { *self } } |