diff options
| author | bors <bors@rust-lang.org> | 2017-03-20 08:31:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-20 08:31:16 +0000 |
| commit | 244f893ed704a60841d4615445d540a21a8d7722 (patch) | |
| tree | ef03d7fdd32204abf7e236da22fb99f85fe7922e /src/libstd | |
| parent | 6738cd4d473668f7af381826d634e573d15e1f11 (diff) | |
| parent | d49f86901cf1128cdc00b7a1b276f6bf266bf937 (diff) | |
| download | rust-244f893ed704a60841d4615445d540a21a8d7722.tar.gz rust-244f893ed704a60841d4615445d540a21a8d7722.zip | |
Auto merge of #40659 - frewsxcv:rollup, r=frewsxcv
Rollup of 9 pull requests - Successful merges: #40241, #40281, #40398, #40521, #40532, #40554, #40566, #40581, #40587 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/error.rs | 5 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index e115263d2eb..3d80120f6b2 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -216,6 +216,11 @@ impl<'a> From<&'a str> for Box<Error> { } } +#[stable(feature = "never_error", since = "1.18.0")] +impl Error for ! { + fn description(&self) -> &str { *self } +} + #[stable(feature = "rust1", since = "1.0.0")] impl Error for str::ParseBoolError { fn description(&self) -> &str { "failed to parse bool" } diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 206a37b8e5d..d01ed1e3fe6 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -272,6 +272,7 @@ #![feature(linkage)] #![feature(macro_reexport)] #![feature(needs_panic_runtime)] +#![feature(never_type)] #![feature(num_bits_bytes)] #![feature(old_wrapping)] #![feature(on_unimplemented)] |