return error early for other httparse error rather than panicking

Author: stevefan1999-personal

examples/server/main.rs

@@ -30,8 +30,9 @@ pub enum WebServerError {
     Io(std::io::Error),
     Framer(FramerError<std::io::Error>),
     WebSocket(ws::Error),
-    HttpError(String),
+    HttpError(httparse::Error),
     Utf8Error,
+    Custom(String),
 }
 
 impl From<std::io::Error> for WebServerError {
@@ -58,6 +59,12 @@ impl From<Utf8Error> for WebServerError {
     }
 }
 
+impl From<httparse::Error> for WebServerError {
+    fn from(err: httparse::Error) -> WebServerError {
+        WebServerError::HttpError(err)
+    }
+}
+
 fn main() -> std::io::Result<()> {
     let addr = "127.0.0.1:1337";
     let listener = TcpListener::bind(addr)?;
@@ -150,7 +157,7 @@ fn handle_client(mut stream: TcpStream) -> Result<()> {
             Err(httparse::Error::TooManyHeaders) => {
                 headers.resize(headers.len() * 2, httparse::EMPTY_HEADER)
             }
-            _ => panic!("http parser error"),
+            Err(e) => return Err(e.into()),
         }
     };
 
@@ -164,7 +171,7 @@ fn handle_client(mut stream: TcpStream) -> Result<()> {
                 msg = e
             );
             stream.write_all(&html.as_bytes())?;
-            Err(WebServerError::HttpError(e))
+            Err(WebServerError::Custom(e))
         }
     }
 }

examples/server_async/main.rs

@@ -51,8 +51,9 @@ pub enum WebServerError {
     Io(std::io::Error),
     Framer(FramerError<std::io::Error>),
     WebSocket(ws::Error),
-    HttpError(String),
+    HttpError(httparse::Error),
     Utf8Error,
+    Custom(String),
 }
 
 impl From<std::io::Error> for WebServerError {
@@ -79,6 +80,12 @@ impl From<Utf8Error> for WebServerError {
     }
 }
 
+impl From<httparse::Error> for WebServerError {
+    fn from(err: httparse::Error) -> WebServerError {
+        WebServerError::HttpError(err)
+    }
+}
+
 #[cfg_attr(feature = "example-async-std", async_std::main)]
 #[cfg_attr(feature = "example-tokio", tokio::main)]
 #[cfg_attr(feature = "example-smol", smol_potat::main)]
@@ -214,7 +221,7 @@ async fn handle_client(mut stream: TcpStream) -> Result<()> {
             Err(httparse::Error::TooManyHeaders) => {
                 headers.resize(headers.len() * 2, httparse::EMPTY_HEADER)
             }
-            _ => panic!("http parser error"),
+            Err(e) => return Err(e.into()),
         }
     };
 
@@ -228,7 +235,7 @@ async fn handle_client(mut stream: TcpStream) -> Result<()> {
                 msg = e
             );
             stream.write_all(&html.as_bytes()).await?;
-            Err(WebServerError::HttpError(e))
+            Err(WebServerError::Custom(e))
         }
     }
 }