about summary refs log tree commit diff
path: root/src/libstd/error.rs
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2016-05-07 22:08:14 -0700
committerManish Goregaokar <manishsmail@gmail.com>2016-05-08 07:02:22 -0700
commitcc98f4cbb09d0165dcca18664d1fe10cb39a5dfa (patch)
treefaffb306c666f3e4ff851eca16ea5baf85dcdea9 /src/libstd/error.rs
parent5d878057d229f63e71481c4259f28cf165b85bd4 (diff)
parenta9779df1886e18923f40cf0bb67ab72d4e4942df (diff)
downloadrust-cc98f4cbb09d0165dcca18664d1fe10cb39a5dfa.tar.gz
rust-cc98f4cbb09d0165dcca18664d1fe10cb39a5dfa.zip
Rollup merge of #33426 - sfackler:try-from, r=aturon
Implement RFC 1542

cc #33417

r? @aturon
Diffstat (limited to 'src/libstd/error.rs')
-rw-r--r--src/libstd/error.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs
index 35cd4a5ec52..d49d9764946 100644
--- a/src/libstd/error.rs
+++ b/src/libstd/error.rs
@@ -159,6 +159,13 @@ impl Error for num::ParseIntError {
     }
 }
 
+#[unstable(feature = "try_from", issue = "33417")]
+impl Error for num::TryFromIntError {
+    fn description(&self) -> &str {
+        self.__description()
+    }
+}
+
 #[stable(feature = "rust1", since = "1.0.0")]
 impl Error for num::ParseFloatError {
     fn description(&self) -> &str {