about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Sproul <micsproul@gmail.com>2016-01-13 10:38:25 +1100
committerMichael Sproul <micsproul@gmail.com>2016-01-13 10:38:44 +1100
commitc1e527f11dfecd57e11b72a5f77725295f4b5ca4 (patch)
tree8344ceab300449eb4403d88b3db60a5d74c6c9ab
parent9520354115dfc00e3c5d3aa951897e9ebf043db6 (diff)
downloadrust-c1e527f11dfecd57e11b72a5f77725295f4b5ca4.tar.gz
rust-c1e527f11dfecd57e11b72a5f77725295f4b5ca4.zip
Add an impl for Box<Error> from &str.
-rw-r--r--src/libstd/error.rs7
-rw-r--r--src/test/run-pass/string-box-error.rs2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs
index e2a51752eb8..c44a4bfe0f1 100644
--- a/src/libstd/error.rs
+++ b/src/libstd/error.rs
@@ -135,6 +135,13 @@ impl<'a, 'b> From<&'b str> for Box<Error + Send + Sync + 'a> {
     }
 }
 
+#[stable(feature = "string_box_error", since = "1.7.0")]
+impl<'a> From<&'a str> for Box<Error> {
+    fn from(err: &'a str) -> Box<Error> {
+        From::from(String::from(err))
+    }
+}
+
 #[stable(feature = "rust1", since = "1.0.0")]
 impl Error for str::ParseBoolError {
     fn description(&self) -> &str { "failed to parse bool" }
diff --git a/src/test/run-pass/string-box-error.rs b/src/test/run-pass/string-box-error.rs
index 351cc50d2dc..a80d9a05935 100644
--- a/src/test/run-pass/string-box-error.rs
+++ b/src/test/run-pass/string-box-error.rs
@@ -15,4 +15,6 @@ use std::error::Error;
 fn main() {
     let _err1: Box<Error + Send + Sync> = From::from("test".to_string());
     let _err2: Box<Error> = From::from("test".to_string());
+    let _err3: Box<Error + Send + Sync + 'static> = From::from("test");
+    let _err4: Box<Error> = From::from("test");
 }