diff --git a/src/codec/mod.rs b/src/codec/mod.rs index 322174c..243d280 100644 --- a/src/codec/mod.rs +++ b/src/codec/mod.rs @@ -1,6 +1,3 @@ -// Until tokio-rs/tokio#680 is fixed -#![allow(deprecated)] - mod error; mod framed_read; mod framed_write; diff --git a/src/proto/streams/buffer.rs b/src/proto/streams/buffer.rs index f2aaf7b..652f2ed 100644 --- a/src/proto/streams/buffer.rs +++ b/src/proto/streams/buffer.rs @@ -93,10 +93,12 @@ impl Deque { } } + /* pub fn peek_front<'a, T>(&self, buf: &'a Buffer) -> Option<&'a T> { match self.indices { Some(idxs) => Some(&buf.slab[idxs.head].value), None => None, } } + */ } diff --git a/src/proto/streams/recv.rs b/src/proto/streams/recv.rs index 6e7bf47..31c264c 100644 --- a/src/proto/streams/recv.rs +++ b/src/proto/streams/recv.rs @@ -456,18 +456,6 @@ impl Recv { } } - pub fn body_is_empty(&self, stream: &store::Ptr) -> bool { - if !stream.state.is_recv_closed() { - return false; - } - - stream - .pending_recv - .peek_front(&self.buffer) - .map(|event| !event.is_data()) - .unwrap_or(true) - } - pub fn is_end_stream(&self, stream: &store::Ptr) -> bool { if !stream.state.is_recv_closed() { return false; @@ -1050,17 +1038,6 @@ impl Recv { } } -// ===== impl Event ===== - -impl Event { - fn is_data(&self) -> bool { - match *self { - Event::Data(..) => true, - _ => false, - } - } -} - // ===== impl Open ===== impl Open { diff --git a/src/proto/streams/streams.rs b/src/proto/streams/streams.rs index 59f74aa..f7319f3 100644 --- a/src/proto/streams/streams.rs +++ b/src/proto/streams/streams.rs @@ -1104,15 +1104,6 @@ impl OpaqueStreamRef { }) } - pub fn body_is_empty(&self) -> bool { - let mut me = self.inner.lock().unwrap(); - let me = &mut *me; - - let stream = me.store.resolve(self.key); - - me.actions.recv.body_is_empty(&stream) - } - pub fn is_end_stream(&self) -> bool { let mut me = self.inner.lock().unwrap(); let me = &mut *me; diff --git a/src/server.rs b/src/server.rs index c2060e2..2bc7562 100644 --- a/src/server.rs +++ b/src/server.rs @@ -405,15 +405,6 @@ where self.connection.poll(cx).map_err(Into::into) } - #[deprecated( - note = "use abrupt_shutdown or graceful_shutdown instead", - since = "0.1.4" - )] - #[doc(hidden)] - pub fn close_connection(&mut self) { - self.graceful_shutdown(); - } - /// Sets the connection to a GOAWAY state. /// /// Does not terminate the connection. Must continue being polled to close diff --git a/src/share.rs b/src/share.rs index 4f6bc39..d209332 100644 --- a/src/share.rs +++ b/src/share.rs @@ -400,13 +400,6 @@ impl RecvStream { RecvStream { inner } } - #[deprecated(since = "0.0.0")] - #[doc(hidden)] - pub fn is_empty(&self) -> bool { - // If the recv side is closed and the receive queue is empty, the body is empty. - self.inner.inner.body_is_empty() - } - /// Returns true if the receive half has reached the end of stream. /// /// A return value of `true` means that calls to `poll` and `poll_trailers`