about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-03-22 23:22:38 +0800
committerkennytm <kennytm@gmail.com>2018-03-22 23:22:38 +0800
commit2c6f911463efa6c2d87e5566fc1cd77a7d26509a (patch)
treea08e85fbbc28f60e993fb753d94e652b15ddb94a /src/libstd
parent2b9674d2b1f0e2caa95f64bb37107063d3d95863 (diff)
parent15bab452f30ce6cb67a849f13e9de80586a8b180 (diff)
downloadrust-2c6f911463efa6c2d87e5566fc1cd77a7d26509a.tar.gz
rust-2c6f911463efa6c2d87e5566fc1cd77a7d26509a.zip
Rollup merge of #49038 - canndrew:replace-infallible-with-never, r=SimonSapin
replace `convert::Infallible` with `!`
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/error.rs9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs
index f8dbe193fed..79bb6af168f 100644
--- a/src/libstd/error.rs
+++ b/src/libstd/error.rs
@@ -56,7 +56,6 @@ use any::TypeId;
 use borrow::Cow;
 use cell;
 use char;
-use convert;
 use core::array;
 use fmt::{self, Debug, Display};
 use mem::transmute;
@@ -371,14 +370,6 @@ impl Error for char::ParseCharError {
     }
 }
 
-#[unstable(feature = "try_from", issue = "33417")]
-impl Error for convert::Infallible {
-    fn description(&self) -> &str {
-        match *self {
-        }
-    }
-}
-
 // copied from any.rs
 impl Error + 'static {
     /// Returns true if the boxed type is the same as `T`