about summary refs log tree commit diff
path: root/src/libstd/os.rs
diff options
context:
space:
mode:
authorMichael Sproul <micsproul@gmail.com>2015-01-17 12:20:11 -0800
committerMichael Sproul <micsproul@gmail.com>2015-01-17 12:20:11 -0800
commit97a2b2638d36fbd9f69c80bd146cdbe9d87e7bcc (patch)
treed8313c98a21bb62717c7cc194a56ce56c7409198 /src/libstd/os.rs
parent89c4e3792ddc5b45706ea0e919806a248f7a87c3 (diff)
downloadrust-97a2b2638d36fbd9f69c80bd146cdbe9d87e7bcc.tar.gz
rust-97a2b2638d36fbd9f69c80bd146cdbe9d87e7bcc.zip
Remove Send bound from Error trait.
Diffstat (limited to 'src/libstd/os.rs')
-rw-r--r--src/libstd/os.rs6
1 files changed, 3 insertions, 3 deletions
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<String> { Some(format!("{:?}", self)) }
 }
 
-impl FromError<MapError> for Box<Error> {
-    fn from_error(err: MapError) -> Box<Error> {
+impl FromError<MapError> for Box<Error + Send> {
+    fn from_error(err: MapError) -> Box<Error + Send> {
         box err
     }
 }