Skip to content

Commit

Permalink
Add an impl for Box<Error> from String.
Browse files Browse the repository at this point in the history
Closes #30156.
  • Loading branch information
michaelsproul committed Dec 22, 2015
1 parent e2834a2 commit 9520354
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/libstd/error.rs
Expand Up @@ -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> {
Expand Down
18 changes: 18 additions & 0 deletions src/test/run-pass/string-box-error.rs
@@ -0,0 +1,18 @@
// 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());
}

0 comments on commit 9520354

Please sign in to comment.