rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rollup merge of #23879: seanmonstar/del-from-error

Browse Source 
Conflicts:
	src/libcore/error.rs
This commit is contained in:
Alex Crichton
2015-03-31 11:27:21 -07:00
parent da04788efc e17f4fc1d4
commit e10ee2c857
10 changed files with 26 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/liballoc/boxed.rs
View File

@@ -51,7 +51,7 @@ use core::prelude::*;
use core::any::Any;
use core::cmp::Ordering;
use core::default::Default;
use core::error::{Error, FromError};
use core::error::Error;
use core::fmt;
use core::hash::{self, Hash};
use core::mem;
@@ -308,8 +308,8 @@ impl<I: DoubleEndedIterator + ?Sized> DoubleEndedIterator for Box<I> {
impl<I: ExactSizeIterator + ?Sized> ExactSizeIterator for Box<I> {}
#[stable(feature = "rust1", since = "1.0.0")]
impl<'a, E: Error + 'a> FromError<E> for Box<Error + 'a> {
fn from_error(err: E) -> Box<Error + 'a> {
impl<'a, E: Error + 'a> From<E> for Box<Error + 'a> {
fn from(err: E) -> Box<Error + 'a> {
Box::new(err)
}
}