diff options
-rw-r--r-- | buffered-reader/src/adapter.rs | 2 | ||||
-rw-r--r-- | buffered-reader/src/dup.rs | 4 | ||||
-rw-r--r-- | buffered-reader/src/limitor.rs | 3 | ||||
-rw-r--r-- | buffered-reader/src/reserve.rs | 3 |
4 files changed, 5 insertions, 7 deletions
diff --git a/buffered-reader/src/adapter.rs b/buffered-reader/src/adapter.rs index 3734d9bc..e319aa8b 100644 --- a/buffered-reader/src/adapter.rs +++ b/buffered-reader/src/adapter.rs @@ -11,9 +11,9 @@ use super::*; /// own. #[derive(Debug)] pub struct Adapter<T: BufferedReader<B>, B: fmt::Debug + Send + Sync, C: fmt::Debug + Sync + Send> { - reader: T, _ghostly_cookie: std::marker::PhantomData<B>, cookie: C, + reader: T, } assert_send_and_sync!(Adapter<T, B, C> diff --git a/buffered-reader/src/dup.rs b/buffered-reader/src/dup.rs index cba6bf23..d5ef6624 100644 --- a/buffered-reader/src/dup.rs +++ b/buffered-reader/src/dup.rs @@ -12,13 +12,13 @@ use super::*; /// at the underlying `BufferedReader`. #[derive(Debug)] pub struct Dup<T: BufferedReader<C>, C: fmt::Debug + Sync + Send> { - reader: T, - // The number of bytes that have been consumed. cursor: usize, // The user settable cookie. cookie: C, + + reader: T, } assert_send_and_sync!(Dup<T, C> diff --git a/buffered-reader/src/limitor.rs b/buffered-reader/src/limitor.rs index 16f3897e..539dee74 100644 --- a/buffered-reader/src/limitor.rs +++ b/buffered-reader/src/limitor.rs @@ -7,10 +7,9 @@ use super::*; /// `BufferedReader`. #[derive(Debug)] pub struct Limitor<T: BufferedReader<C>, C: fmt::Debug + Sync + Send> { - reader: T, limit: u64, - cookie: C, + reader: T, } assert_send_and_sync!(Limitor<T, C> diff --git a/buffered-reader/src/reserve.rs b/buffered-reader/src/reserve.rs index 76d82124..6de46627 100644 --- a/buffered-reader/src/reserve.rs +++ b/buffered-reader/src/reserve.rs @@ -11,10 +11,9 @@ use super::*; /// it causes at least N bytes to by buffered. #[derive(Debug)] pub struct Reserve<T: BufferedReader<C>, C: fmt::Debug + Sync + Send> { - reader: T, reserve: usize, - cookie: C, + reader: T, } assert_send_and_sync!(Reserve<T, C> |