diff options
| author | bors <bors@rust-lang.org> | 2017-04-20 01:56:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-20 01:56:59 +0000 |
| commit | 1bb1530239c801bb46b705eb2874ac4e5b213e54 (patch) | |
| tree | 88782f0acc8bcbcfe082ac5e746ecdde170d3183 /src/libstd/error.rs | |
| parent | 452bf0852e1d47f7478d8b81328c15b183c6d971 (diff) | |
| parent | 1c69895f865b710ab72a5e354208ebbc9ed95069 (diff) | |
| download | rust-1bb1530239c801bb46b705eb2874ac4e5b213e54.tar.gz rust-1bb1530239c801bb46b705eb2874ac4e5b213e54.zip | |
Auto merge of #41411 - frewsxcv:rollup, r=frewsxcv
Rollup of 7 pull requests - Successful merges: #41295, #41348, #41374, #41380, #41391, #41398, #41403 - Failed merges: #41376
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 } } |