fix merge conflicts

Signed-off-by: Yoshua Wuyts <[email protected]>

Author: yoshuawuyts

examples/server.rs

@@ -14,7 +14,7 @@ async fn accept(addr: String, stream: TcpStream) -> Result<(), async_h1::Excepti
     // TODO: Delete this line when we implement `Clone` for `TcpStream`.
     let stream = Stream(Arc::new(stream));
 
-    server::connect(&addr, stream.clone(), stream, |_| {
+    server::accept(&addr, stream.clone(), stream, |_| {
         async {
             let resp = Response::new(StatusCode::Ok)
                 .set_header("Content-Type", "text/plain")?

src/server.rs

@@ -15,7 +15,10 @@ use std::pin::Pin;
 
 use crate::{Exception, MAX_HEADERS};
 
-pub async fn connect<R, W, F, Fut>(
+/// Parse an incoming HTTP connection.
+///
+/// Supports `KeepAlive` requests by default.
+pub async fn accept<R, W, F, Fut>(
     addr: &str,
     reader: R,
     mut writer: W,
@@ -80,7 +83,7 @@ where
 ///
 /// This is returned from [`encode`].
 #[derive(Debug)]
-pub struct Encoder {
+struct Encoder {
     /// Keep track how far we've indexed into the headers + body.
     cursor: usize,
     /// HTTP headers to be sent.