File tree Expand file tree Collapse file tree 3 files changed +8
-8
lines changed Expand file tree Collapse file tree 3 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 1818//! chain information:
1919//!
2020//! ```
21- //! trait Error: Send {
21+ //! trait Error {
2222//! fn description(&self) -> &str;
2323//!
2424//! fn detail(&self) -> Option<String> { None }
@@ -87,7 +87,7 @@ use string::{FromUtf8Error, FromUtf16Error};
8787
8888/// Base functionality for all errors in Rust.
8989#[ unstable = "the exact API of this trait may change" ]
90- pub trait Error : Send {
90+ pub trait Error {
9191 /// A short description of the error; usually a static string.
9292 fn description ( & self ) -> & str ;
9393
Original file line number Diff line number Diff line change @@ -234,7 +234,7 @@ use error::{FromError, Error};
234234use fmt;
235235use int;
236236use iter:: { Iterator , IteratorExt } ;
237- use marker:: Sized ;
237+ use marker:: { Sized , Send } ;
238238use mem:: transmute;
239239use ops:: FnOnce ;
240240use option:: Option ;
@@ -363,8 +363,8 @@ impl Error for IoError {
363363 }
364364}
365365
366- impl FromError < IoError > for Box < Error > {
367- fn from_error ( err : IoError ) -> Box < Error > {
366+ impl FromError < IoError > for Box < Error + Send > {
367+ fn from_error ( err : IoError ) -> Box < Error + Send > {
368368 box err
369369 }
370370}
Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ use error::{FromError, Error};
3737use fmt;
3838use io:: { IoResult , IoError } ;
3939use iter:: { Iterator , IteratorExt } ;
40- use marker:: Copy ;
40+ use marker:: { Copy , Send } ;
4141use libc:: { c_void, c_int, c_char} ;
4242use libc;
4343use boxed:: Box ;
@@ -937,8 +937,8 @@ impl Error for MapError {
937937 fn detail ( & self ) -> Option < String > { Some ( format ! ( "{:?}" , self ) ) }
938938}
939939
940- impl FromError < MapError > for Box < Error > {
941- fn from_error ( err : MapError ) -> Box < Error > {
940+ impl FromError < MapError > for Box < Error + Send > {
941+ fn from_error ( err : MapError ) -> Box < Error + Send > {
942942 box err
943943 }
944944}
You can’t perform that action at this time.
0 commit comments