From ed6ddd46bdb0fdc82c65afddd90bf850e86dfd7e Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sat, 27 Mar 2021 15:47:46 -0700 Subject: [PATCH] Inline Chunks::done --- quinn-proto/src/connection/streams/recv.rs | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/quinn-proto/src/connection/streams/recv.rs b/quinn-proto/src/connection/streams/recv.rs index 7eeb554f6..1fd7bee61 100644 --- a/quinn-proto/src/connection/streams/recv.rs +++ b/quinn-proto/src/connection/streams/recv.rs @@ -307,10 +307,12 @@ impl<'a> Chunks<'a> { match state { ChunksState::Readable(mut rs) => { debug_assert!(!drop); - let should_transmit = - Self::done(&mut rs, self.read, self.id, self.streams, self.pending); + let (_, max_stream_data) = rs.max_stream_data(self.streams.stream_receive_window); + let max_data = self.streams.add_read_credits(self.read); + self.pending + .post_read(self.id, max_data, max_stream_data, false); self.streams.recv.insert(self.id, rs); - should_transmit + ShouldTransmit(max_stream_data.0 | max_data.0) } ChunksState::Finished => { debug_assert!(!drop); @@ -326,19 +328,6 @@ impl<'a> Chunks<'a> { ChunksState::Finalized => ShouldTransmit(false), } } - - fn done( - rs: &mut Recv, - read: u64, - id: StreamId, - streams: &mut StreamsState, - pending: &mut Retransmits, - ) -> ShouldTransmit { - let (_, max_stream_data) = rs.max_stream_data(streams.stream_receive_window); - let max_data = streams.add_read_credits(read); - pending.post_read(id, max_data, max_stream_data, false); - ShouldTransmit(max_stream_data.0 | max_data.0) - } } impl<'a> Drop for Chunks<'a> {