Rollup merge of rust-lang#40566 - clarcharr:never_error, r=sfackler

Implement std::error::Error for !.
frewsxcv · Mar 20, 2017 · 4e90331 · 4e90331
2 parents dedf9d3 + a5cf551
commit 4e90331
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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)]