diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 9963e4861b7..ff128461978 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -18,7 +18,7 @@ //! chain information: //! //! ``` -//! trait Error: Send { +//! trait Error { //! fn description(&self) -> &str; //! //! fn detail(&self) -> Option { None } @@ -87,7 +87,7 @@ use string::{FromUtf8Error, FromUtf16Error}; /// Base functionality for all errors in Rust. #[unstable = "the exact API of this trait may change"] -pub trait Error: Send { +pub trait Error { /// A short description of the error; usually a static string. fn description(&self) -> &str; diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index bab4dafd090..86afc6decab 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -234,7 +234,7 @@ use error::{FromError, Error}; use fmt; use int; use iter::{Iterator, IteratorExt}; -use marker::Sized; +use marker::{Sized, Send}; use mem::transmute; use ops::FnOnce; use option::Option; @@ -363,8 +363,8 @@ impl Error for IoError { } } -impl FromError for Box { - fn from_error(err: IoError) -> Box { +impl FromError for Box { + fn from_error(err: IoError) -> Box { box err } } diff --git a/src/libstd/os.rs b/src/libstd/os.rs index fc0c838a3f1..78db6c158a8 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -37,7 +37,7 @@ use error::{FromError, Error}; use fmt; use io::{IoResult, IoError}; use iter::{Iterator, IteratorExt}; -use marker::Copy; +use marker::{Copy, Send}; use libc::{c_void, c_int, c_char}; use libc; use boxed::Box; @@ -937,8 +937,8 @@ impl Error for MapError { fn detail(&self) -> Option { Some(format!("{:?}", self)) } } -impl FromError for Box { - fn from_error(err: MapError) -> Box { +impl FromError for Box { + fn from_error(err: MapError) -> Box { box err } }