diff options
| -rw-r--r-- | src/libstd/error.rs | 16 | ||||
| -rw-r--r-- | src/test/run-pass/string-box-error.rs | 20 |
2 files changed, 36 insertions, 0 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 46d03169b2d..c44a4bfe0f1 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -119,6 +119,15 @@ impl From<String> for Box<Error + Send + Sync> { } } +#[stable(feature = "string_box_error", since = "1.7.0")] +impl From<String> for Box<Error> { + fn from(str_err: String) -> Box<Error> { + let err1: Box<Error + Send + Sync> = From::from(str_err); + let err2: Box<Error> = err1; + err2 + } +} + #[stable(feature = "rust1", since = "1.0.0")] impl<'a, 'b> From<&'b str> for Box<Error + Send + Sync + 'a> { fn from(err: &'b str) -> Box<Error + Send + Sync + 'a> { @@ -126,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 new file mode 100644 index 00000000000..a80d9a05935 --- /dev/null +++ b/src/test/run-pass/string-box-error.rs @@ -0,0 +1,20 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Ensure that both `Box<Error + Send + Sync>` and `Box<Error>` can be obtained from `String`. + +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"); +} |