From 73065fa443181fbbd8d7147ae8de95b8f5587b37 Mon Sep 17 00:00:00 2001
From: stammw <begue.jc@gmail.com>
Date: Fri, 23 Aug 2019 15:35:55 +0200
Subject: [PATCH] H3: rename RecvBody into ReadToEnd and Receiver into RecvBody

---
 quinn-h3/examples/h3.rs |  4 ++--
 quinn-h3/src/body.rs    | 17 +++++++++--------
 quinn-h3/src/client.rs  |  6 +++---
 quinn-h3/src/server.rs  |  4 ++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/quinn-h3/examples/h3.rs b/quinn-h3/examples/h3.rs
index b7b5d7596..928b949d2 100644
--- a/quinn-h3/examples/h3.rs
+++ b/quinn-h3/examples/h3.rs
@@ -17,7 +17,7 @@ use url::Url;
 use quinn::ConnectionDriver as QuicDriver;
 use quinn_h3::{
     self,
-    body::Receiver,
+    body::RecvBody,
     client::Builder as ClientBuilder,
     connection::ConnectionDriver,
     server::{Builder as ServerBuilder, IncomingRequest, Sender},
@@ -191,7 +191,7 @@ fn handle_connection(
 
 fn handle_request(
     request: Request<()>,
-    body: Receiver,
+    body: RecvBody,
     sender: Sender,
 ) -> impl Future<Item = (), Error = Error> {
     println!("received request: {:?}", request);
diff --git a/quinn-h3/src/body.rs b/quinn-h3/src/body.rs
index 66018a57a..3a854e2a1 100644
--- a/quinn-h3/src/body.rs
+++ b/quinn-h3/src/body.rs
@@ -2,6 +2,7 @@ use std::{
     cmp,
     io::{self, ErrorKind},
     mem,
+    fmt,
 };
 
 use bytes::{Bytes, BytesMut};
@@ -97,23 +98,23 @@ impl Future for SendBody {
     }
 }
 
-pub struct Receiver {
+pub struct RecvBody {
     recv: FrameStream,
     conn: ConnectionRef,
     stream_id: StreamId,
 }
 
-impl Receiver {
+impl RecvBody {
     pub(crate) fn new(recv: FrameStream, conn: ConnectionRef, stream_id: StreamId) -> Self {
-        Self {
+        RecvBody {
             conn,
             stream_id,
             recv,
         }
     }
 
-    pub fn into_future(self) -> RecvBody {
-        RecvBody::new(self.recv, self.conn, self.stream_id)
+    pub fn read_to_end(self) -> ReadToEnd {
+        ReadToEnd::new(self.recv, self.conn, self.stream_id)
     }
 
     pub fn into_reader(self) -> BodyReader {
@@ -125,7 +126,7 @@ impl Receiver {
     }
 }
 
-pub struct RecvBody {
+pub struct ReadToEnd {
     state: RecvBodyState,
     capacity: usize,
     max_size: usize,
@@ -135,7 +136,7 @@ pub struct RecvBody {
     stream_id: StreamId,
 }
 
-impl RecvBody {
+impl ReadToEnd {
     pub(crate) fn new(recv: FrameStream, conn: ConnectionRef, stream_id: StreamId) -> Self {
         Self {
             conn,
@@ -179,7 +180,7 @@ enum RecvBodyState {
     Finished,
 }
 
-impl Future for RecvBody {
+impl Future for ReadToEnd {
     type Item = (Option<Bytes>, Option<HeaderMap>);
     type Error = crate::Error;
 
diff --git a/quinn-h3/src/client.rs b/quinn-h3/src/client.rs
index 95163eaf1..53724ee9d 100644
--- a/quinn-h3/src/client.rs
+++ b/quinn-h3/src/client.rs
@@ -10,7 +10,7 @@ use slog::{self, o, Logger};
 use tokio_io::io::{Shutdown, WriteAll};
 
 use crate::{
-    body::{Body, Receiver, SendBody},
+    body::{Body, RecvBody, SendBody},
     connection::{ConnectionDriver, ConnectionRef},
     frame::{FrameDecoder, FrameStream},
     headers::DecodeHeaders,
@@ -195,7 +195,7 @@ impl SendRequest {
 }
 
 impl Future for SendRequest {
-    type Item = (Response<()>, Receiver);
+    type Item = (Response<()>, RecvBody);
     type Error = Error;
 
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
@@ -274,7 +274,7 @@ impl Future for SendRequest {
                         SendRequestState::Ready(h) => {
                             return Ok(Async::Ready((
                                 Self::build_response(h)?,
-                                Receiver::new(
+                                RecvBody::new(
                                     try_take(&mut self.recv, "Recv is none")?,
                                     self.conn.clone(),
                                     try_take(&mut self.stream_id, "stream is none")?,
diff --git a/quinn-h3/src/server.rs b/quinn-h3/src/server.rs
index 500b7efd6..f3865988b 100644
--- a/quinn-h3/src/server.rs
+++ b/quinn-h3/src/server.rs
@@ -10,7 +10,7 @@ use slog::{self, o, Logger};
 use tokio_io::io::{Shutdown, WriteAll};
 
 use crate::{
-    body::{Body, Receiver, SendBody},
+    body::{Body, RecvBody, SendBody},
     connection::{ConnectionDriver, ConnectionRef},
     frame::{FrameDecoder, FrameStream},
     headers::DecodeHeaders,
@@ -177,7 +177,7 @@ impl RecvRequest {
 }
 
 impl Future for RecvRequest {
-    type Item = (Request<()>, Receiver, Sender);
+    type Item = (Request<()>, RecvBody, Sender);
     type Error = Error;
 
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> {