summary refs log tree commit diff
path: root/src/libstd/io/buffered.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-02 09:19:00 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-02 09:19:00 -0800
commit009ec5d2b0c4ab0e7dc7ab2f6b15754b4da14caf (patch)
tree8b441fd58860857f2e7bf5eabbf2226b92bf13c7 /src/libstd/io/buffered.rs
parent0101bbe7acb38e8113c0cafeb7d5ae0be6448e5b (diff)
parentf3a7ec7028c76b3a1c6051131328f372b068e33a (diff)
downloadrust-009ec5d2b0c4ab0e7dc7ab2f6b15754b4da14caf.tar.gz
rust-009ec5d2b0c4ab0e7dc7ab2f6b15754b4da14caf.zip
rollup merge of #20315: alexcrichton/std-sync
Conflicts:
	src/libstd/rt/exclusive.rs
	src/libstd/sync/barrier.rs
	src/libstd/sys/unix/pipe.rs
	src/test/bench/shootout-binarytrees.rs
	src/test/bench/shootout-fannkuch-redux.rs
Diffstat (limited to 'src/libstd/io/buffered.rs')
-rw-r--r--src/libstd/io/buffered.rs6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs
index ffd4122492b..852cab500f6 100644
--- a/src/libstd/io/buffered.rs
+++ b/src/libstd/io/buffered.rs
@@ -22,7 +22,6 @@ use result::Result::{Ok, Err};
 use slice::{SliceExt};
 use slice;
 use vec::Vec;
-use kinds::{Send,Sync};
 
 /// Wraps a Reader and buffers input from it
 ///
@@ -52,11 +51,6 @@ pub struct BufferedReader<R> {
     cap: uint,
 }
 
-
-unsafe impl<R: Send> Send for BufferedReader<R> {}
-unsafe impl<R: Send+Sync> Sync for BufferedReader<R> {}
-
-
 impl<R: Reader> BufferedReader<R> {
     /// Creates a new `BufferedReader` with the specified buffer capacity
     pub fn with_capacity(cap: uint, inner: R) -> BufferedReader<R> {