Minor interface cleanup

Author: stepancheg

httpbis/src/lib.rs

@@ -39,6 +39,7 @@ pub use server::stream_handler::ServerRequestStreamHandler;
 pub use server::tls::ServerTlsOption;
 pub use server::Server;
 pub use server::ServerBuilder;
+pub use solicit::end_stream::EndStream;
 pub use solicit::error_code::ErrorCode;
 pub use solicit::header::name::HeaderName;
 pub use solicit::header::name::PseudoHeaderName;

httpbis/src/server/conn.rs

@@ -138,7 +138,7 @@ where
         let invoke_result = {
             let req = ServerRequest {
                 headers,
-                end_stream: end_stream == EndStream::Yes,
+                end_stream,
                 stream_id,
                 in_window_size,
                 stream_handler: &mut stream_handler,

httpbis/src/server/req.rs

@@ -10,6 +10,7 @@ use crate::server::conn::ServerToWriteMessage;
 use crate::server::increase_in_window::ServerIncreaseInWindow;
 use crate::server::stream_handler::ServerRequestStreamHandler;
 use crate::server::stream_handler::ServerRequestStreamHandlerHolder;
+use crate::EndStream;
 use crate::Headers;
 use crate::StreamAfterHeaders;
 use crate::StreamId;
@@ -19,7 +20,7 @@ pub struct ServerRequest<'a> {
     /// Request headers.
     pub headers: Headers,
     /// True if requests ends with headers (no body).
-    pub end_stream: bool,
+    pub end_stream: EndStream,
     pub(crate) stream_id: StreamId,
     /// Stream in window size at the moment of request start
     pub(crate) in_window_size: u32,
@@ -31,16 +32,19 @@ pub struct ServerRequest<'a> {
 impl<'a> ServerRequest<'a> {
     /// Convert a request into a pullable stream.
     pub fn into_stream(self) -> impl StreamAfterHeaders {
-        if self.end_stream {
-            Box::pin(HttpStreamAfterHeadersEmpty)
-        } else {
-            let conn_died = self.conn_died.clone();
-            self.register_stream_handler::<_, _, StreamAfterHeadersBox>(move |increase_in_window| {
-                let (inc_tx, inc_rx) = stream_queue_sync(conn_died);
-                let stream_from_network = StreamFromNetwork::new(inc_rx, increase_in_window.0);
-
-                (inc_tx, Box::pin(stream_from_network))
-            })
+        match self.end_stream {
+            EndStream::Yes => Box::pin(HttpStreamAfterHeadersEmpty),
+            EndStream::No => {
+                let conn_died = self.conn_died.clone();
+                self.register_stream_handler::<_, _, StreamAfterHeadersBox>(
+                    move |increase_in_window| {
+                        let (inc_tx, inc_rx) = stream_queue_sync(conn_died);
+                        let stream_from_network =
+                            StreamFromNetwork::new(inc_rx, increase_in_window.0);
+                        (inc_tx, Box::pin(stream_from_network))
+                    },
+                )
+            }
         }
     }
 

httpbis/src/solicit/end_stream.rs

@@ -1,13 +1,14 @@
 /// An enum indicating whether the `HttpConnection` send operation should end the stream.
 #[derive(Clone, Copy, PartialEq, Debug)]
 pub enum EndStream {
-    /// The stream should be closed
+    /// The stream is closed/should be closed.
     Yes,
-    /// The stream should still be kept open
+    /// The stream is open/should be kept open.
     No,
 }
 
 impl EndStream {
+    /// Convert from boolean.
     pub fn from_bool(end_stream: bool) -> EndStream {
         match end_stream {
             true => EndStream::Yes,