diff --git a/quinn-proto/src/connection/mod.rs b/quinn-proto/src/connection/mod.rs index 8b3df99e8..eb137ccf3 100644 --- a/quinn-proto/src/connection/mod.rs +++ b/quinn-proto/src/connection/mod.rs @@ -904,12 +904,8 @@ where } /// Read the next ordered chunk from the given recv stream - pub fn read_chunk( - &mut self, - id: StreamId, - max_length: usize, - ) -> Result, ReadError> { - let result = self.streams.read_chunk(id, max_length); + pub fn read(&mut self, id: StreamId, max_length: usize) -> Result, ReadError> { + let result = self.streams.read(id, max_length); self.post_read(id, &result); Ok(result?.map(|x| x.result)) } diff --git a/quinn-proto/src/connection/streams.rs b/quinn-proto/src/connection/streams.rs index 34197b7e9..b591a6b0c 100644 --- a/quinn-proto/src/connection/streams.rs +++ b/quinn-proto/src/connection/streams.rs @@ -204,8 +204,8 @@ impl Streams { self.try_read(id, |rs| rs.read_unordered()) } - pub(crate) fn read_chunk(&mut self, id: StreamId, max_length: usize) -> ReadResult { - self.try_read(id, |rs| rs.read_chunk(max_length)) + pub(crate) fn read(&mut self, id: StreamId, max_length: usize) -> ReadResult { + self.try_read(id, |rs| rs.read(max_length)) } pub(crate) fn read_chunks( @@ -1006,7 +1006,7 @@ mod tests { ); assert_eq!(client.data_recvd, 2048); assert_eq!(client.local_max_data - initial_max, 0); - client.read_chunk(id, 1024).unwrap(); + client.read(id, 1024).unwrap(); assert_eq!(client.local_max_data - initial_max, 1024); assert_eq!( client @@ -1107,7 +1107,7 @@ mod tests { } ); assert!(client.stop(id).is_err()); - assert_eq!(client.read_chunk(id, 0), Err(ReadError::UnknownStream)); + assert_eq!(client.read(id, 0), Err(ReadError::UnknownStream)); assert_eq!(client.read_unordered(id), Err(ReadError::UnknownStream)); assert_eq!(client.local_max_data - initial_max, 32); assert_eq!( diff --git a/quinn-proto/src/connection/streams/recv.rs b/quinn-proto/src/connection/streams/recv.rs index 6a45109de..bddce94fa 100644 --- a/quinn-proto/src/connection/streams/recv.rs +++ b/quinn-proto/src/connection/streams/recv.rs @@ -73,7 +73,7 @@ impl Recv { } } - pub(super) fn read_chunk(&mut self, max_length: usize) -> StreamReadResult { + pub(super) fn read(&mut self, max_length: usize) -> StreamReadResult { if self.assembler.is_stopped() { return Err(ReadError::UnknownStream); } diff --git a/quinn-proto/src/tests/mod.rs b/quinn-proto/src/tests/mod.rs index 6e0250a9a..bb26763e8 100644 --- a/quinn-proto/src/tests/mod.rs +++ b/quinn-proto/src/tests/mod.rs @@ -752,13 +752,13 @@ fn key_update_reordered() { let buf1 = pair .server_conn_mut(server_ch) - .read_chunk(s, usize::MAX) + .read(s, usize::MAX) .unwrap() .unwrap(); assert_matches!(&*buf1, MSG1); let buf2 = pair .server_conn_mut(server_ch) - .read_chunk(s, usize::MAX) + .read(s, usize::MAX) .unwrap() .unwrap(); assert_eq!(buf2, MSG2); @@ -978,7 +978,7 @@ fn test_flow_control(config: TransportConfig, window_size: usize) { .unwrap(); pair.drive(); assert_eq!( - pair.server_conn_mut(server_conn).read_chunk(s, usize::MAX), + pair.server_conn_mut(server_conn).read(s, usize::MAX), Err(ReadError::Reset(VarInt(42))) ); @@ -997,7 +997,7 @@ fn test_flow_control(config: TransportConfig, window_size: usize) { pair.drive(); let mut cursor = 0; loop { - match pair.server_conn_mut(server_conn).read_chunk(s, usize::MAX) { + match pair.server_conn_mut(server_conn).read(s, usize::MAX) { Ok(Some(buf)) => { cursor += buf.len(); } @@ -1028,7 +1028,7 @@ fn test_flow_control(config: TransportConfig, window_size: usize) { pair.drive(); let mut cursor = 0; loop { - match pair.server_conn_mut(server_conn).read_chunk(s, usize::MAX) { + match pair.server_conn_mut(server_conn).read(s, usize::MAX) { Ok(Some(buf)) => { cursor += buf.len(); } diff --git a/quinn/src/streams.rs b/quinn/src/streams.rs index 61cf0476d..c896353f3 100644 --- a/quinn/src/streams.rs +++ b/quinn/src/streams.rs @@ -354,7 +354,7 @@ where ) -> Poll> { self.poll_read_generic(cx, |conn, stream| { conn.inner - .read_chunk(stream, buf.remaining()) + .read(stream, buf.remaining()) .map(|val| val.map(|chunk| buf.put_slice(&chunk))) }) .map(|res| res.map(|_| ())) @@ -398,7 +398,7 @@ where cx: &mut Context, max_length: usize, ) -> Poll, ReadError>> { - self.poll_read_generic(cx, |conn, stream| conn.inner.read_chunk(stream, max_length)) + self.poll_read_generic(cx, |conn, stream| conn.inner.read(stream, max_length)) } /// Read the next segments of data