about summary refs log tree commit diff
path: root/src/libstd/io
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/io
parent89c4e3792ddc5b45706ea0e919806a248f7a87c3 (diff)
downloadrust-97a2b2638d36fbd9f69c80bd146cdbe9d87e7bcc.tar.gz
rust-97a2b2638d36fbd9f69c80bd146cdbe9d87e7bcc.zip
Remove Send bound from Error trait.
Diffstat (limited to 'src/libstd/io')
-rw-r--r--src/libstd/io/mod.rs6
1 files changed, 3 insertions, 3 deletions
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<IoError> for Box<Error> {
-    fn from_error(err: IoError) -> Box<Error> {
+impl FromError<IoError> for Box<Error + Send> {
+    fn from_error(err: IoError) -> Box<Error + Send> {
         box err
     }
 }