Skip to content

Commit 4e90331

Browse files
authored
Rollup merge of #40566 - clarcharr:never_error, r=sfackler
Implement std::error::Error for !.
2 parents dedf9d3 + a5cf551 commit 4e90331

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/libstd/error.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,11 @@ impl<'a> From<&'a str> for Box<Error> {
216216
}
217217
}
218218

219+
#[stable(feature = "never_error", since = "1.18.0")]
220+
impl Error for ! {
221+
fn description(&self) -> &str { *self }
222+
}
223+
219224
#[stable(feature = "rust1", since = "1.0.0")]
220225
impl Error for str::ParseBoolError {
221226
fn description(&self) -> &str { "failed to parse bool" }

src/libstd/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@
272272
#![feature(linkage)]
273273
#![feature(macro_reexport)]
274274
#![feature(needs_panic_runtime)]
275+
#![feature(never_type)]
275276
#![feature(num_bits_bytes)]
276277
#![feature(old_wrapping)]
277278
#![feature(on_unimplemented)]

0 commit comments

Comments
 (0)