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 18
18
//! chain information:
19
19
//!
20
20
//! ```
21
- //! trait Error: Send {
21
+ //! trait Error {
22
22
//! fn description(&self) -> &str;
23
23
//!
24
24
//! fn detail(&self) -> Option<String> { None }
@@ -87,7 +87,7 @@ use string::{FromUtf8Error, FromUtf16Error};
87
87
88
88
/// Base functionality for all errors in Rust.
89
89
#[ unstable = "the exact API of this trait may change" ]
90
- pub trait Error : Send {
90
+ pub trait Error {
91
91
/// A short description of the error; usually a static string.
92
92
fn description ( & self ) -> & str ;
93
93
Original file line number Diff line number Diff line change @@ -234,7 +234,7 @@ use error::{FromError, Error};
234
234
use fmt;
235
235
use int;
236
236
use iter:: { Iterator , IteratorExt } ;
237
- use marker:: Sized ;
237
+ use marker:: { Sized , Send } ;
238
238
use mem:: transmute;
239
239
use ops:: FnOnce ;
240
240
use option:: Option ;
@@ -363,8 +363,8 @@ impl Error for IoError {
363
363
}
364
364
}
365
365
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 > {
368
368
box err
369
369
}
370
370
}
Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ use error::{FromError, Error};
37
37
use fmt;
38
38
use io:: { IoResult , IoError } ;
39
39
use iter:: { Iterator , IteratorExt } ;
40
- use marker:: Copy ;
40
+ use marker:: { Copy , Send } ;
41
41
use libc:: { c_void, c_int, c_char} ;
42
42
use libc;
43
43
use boxed:: Box ;
@@ -937,8 +937,8 @@ impl Error for MapError {
937
937
fn detail ( & self ) -> Option < String > { Some ( format ! ( "{:?}" , self ) ) }
938
938
}
939
939
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 > {
942
942
box err
943
943
}
944
944
}
You can’t perform that action at this time.
0 commit comments