Lift connect & accept to top-level

Author: yoshuawuyts

examples/server.rs

@@ -27,7 +27,7 @@ async fn main() -> http_types::Result<()> {
 // Take a TCP stream, and convert it into sequential HTTP request / response pairs.
 async fn accept(addr: String, stream: TcpStream) -> http_types::Result<()> {
     println!("starting new connection from {}", stream.peer_addr()?);
-    async_h1::server::accept(&addr, stream.clone(), |_req| async move {
+    async_h1::accept(&addr, stream.clone(), |_req| async move {
         let mut res = Response::new(StatusCode::Ok);
         res.insert_header("Content-Type", "text/plain")?;
         res.set_body("Hello");

src/client.rs

@@ -18,6 +18,7 @@ use crate::date::fmt_http_date;
 use crate::MAX_HEADERS;
 
 /// An HTTP encoder.
+#[doc(hidden)]
 #[derive(Debug)]
 pub struct Encoder {
     /// Keep track how far we've indexed into the headers + body.
@@ -65,7 +66,8 @@ where
 }
 
 /// Encode an HTTP request on the client.
-pub async fn encode(req: Request) -> Result<Encoder, Error> {
+#[doc(hidden)]
+async fn encode(req: Request) -> Result<Encoder, Error> {
     let mut buf: Vec<u8> = vec![];
 
     let mut url = req.url().path().to_owned();
@@ -132,6 +134,7 @@ pub async fn encode(req: Request) -> Result<Encoder, Error> {
 }
 
 /// Decode an HTTP response on the client.
+#[doc(hidden)]
 pub async fn decode<R>(reader: R) -> Result<Response, Error>
 where
     R: Read + Unpin + Send + Sync + 'static,

src/lib.rs

@@ -36,9 +36,12 @@
 /// The maximum amount of headers parsed on the server.
 const MAX_HEADERS: usize = 128;
 
+mod server;
+mod chunked;
+mod date;
 
+#[doc(hidden)]
 pub mod client;
-pub mod server;
 
-mod chunked;
-mod date;
+pub use client::connect;
+pub use server::accept;

tests/server.rs

@@ -1,4 +1,3 @@
-use async_h1::server;
 use async_std::io::Cursor;
 use async_std::prelude::*;
 use common::TestCase;
@@ -11,7 +10,7 @@ async fn test_basic_request() {
     let case = TestCase::new_server("fixtures/request1.txt", "fixtures/response1.txt").await;
     let addr = "http://example.com";
 
-    server::accept(addr, case.clone(), |_req| async {
+    async_h1::accept(addr, case.clone(), |_req| async {
         let mut resp = Response::new(StatusCode::Ok);
         resp.set_body("");
         Ok(resp)
@@ -31,7 +30,7 @@ async fn test_chunked_basic() {
     .await;
     let addr = "http://example.com";
 
-    server::accept(addr, case.clone(), |_req| async {
+    async_h1::accept(addr, case.clone(), |_req| async {
         let mut resp = Response::new(StatusCode::Ok);
         resp.set_body(Body::from_reader(
             Cursor::new(b"Mozilla")
@@ -57,7 +56,7 @@ async fn test_chunked_echo() {
     .await;
     let addr = "http://example.com";
 
-    server::accept(addr, case.clone(), |req| async {
+    async_h1::accept(addr, case.clone(), |req| async {
         let mut resp = Response::new(StatusCode::Ok);
         let ct = req.content_type();
         let body: Body = req.into();