OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #23979 - Ryman:error_from_string, r=alexcrichton

This commit is contained in:
Manish Goregaokar 2015-04-04 10:53:22 +05:30
parent f207ecbe02 8b719eefc0
commit d0c32834f4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libstd/error.rs
View File

@ -88,8 +88,8 @@ impl<'a, E: Error + Send + 'a> From<E> for Box<Error + Send + 'a> {
}
#[stable(feature = "rust1", since = "1.0.0")]
impl<'a, 'b> From<&'b str> for Box<Error + Send + 'a> {
fn from(err: &'b str) -> Box<Error + Send + 'a> {
impl From<String> for Box<Error + Send> {
fn from(err: String) -> Box<Error + Send> {
#[derive(Debug)]
struct StringError(String);
@ -103,7 +103,14 @@ impl<'a, 'b> From<&'b str> for Box<Error + Send + 'a> {
}
}
Box::new(StringError(String::from_str(err)))
Box::new(StringError(err))
}
}
#[stable(feature = "rust1", since = "1.0.0")]
impl<'a, 'b> From<&'b str> for Box<Error + Send + 'a> {
fn from(err: &'b str) -> Box<Error + Send + 'a> {
From::from(String::from_str(err))
}
}