diff --git a/src/error.rs b/src/error.rs index 6057cb4..2d5e181 100644 --- a/src/error.rs +++ b/src/error.rs @@ -1,7 +1,6 @@ -use std::borrow::Borrow; use std::fmt; -#[derive(Copy, Clone)] +#[derive(Copy, Clone, Debug)] pub enum Kind { InvalidEndpointError, JsonParseError, @@ -11,12 +10,13 @@ pub enum Kind { IoError, } -#[derive(Copy, Clone)] +#[derive(Copy, Clone, Debug)] pub enum Class { ClientError, ServerError, } +#[derive(Debug)] pub struct Error { kind: Kind, msg: Option, @@ -89,12 +89,6 @@ impl fmt::Display for Error { } } -impl fmt::Debug for Error { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - self.fmt(f) - } -} - impl From for Error { fn from(error: std::io::Error) -> Self { Error { diff --git a/src/http/handler.rs b/src/http/handler.rs index b2ff1b2..2b7e0a3 100644 --- a/src/http/handler.rs +++ b/src/http/handler.rs @@ -113,7 +113,7 @@ fn endpoint_handler( client.server_keep_alive = false; } - client.stream.write_all(buf.as_bytes()); + client.stream.write_all(buf.as_bytes()).unwrap(); }; let length = req.find_header("Content-Length"); @@ -141,7 +141,7 @@ fn endpoint_handler( }; let mut buf = [0; 8192]; - client.stream.read_exact(&mut buf[..length]); + client.stream.read_exact(&mut buf[..length]).unwrap(); // TODO decompress let input = match serde_json::from_slice(&buf[..length]) { @@ -160,6 +160,6 @@ fn endpoint_handler( res.add_header("Content-Type", "application/json; charset=utf-8"); res.status(200); - res.send(&mut client.stream); - client.stream.write_all(buf.as_bytes()); + res.send(&mut client.stream).unwrap(); + client.stream.write_all(buf.as_bytes()).unwrap(); } diff --git a/src/http/mod.rs b/src/http/mod.rs index ce0a5fb..eec7968 100644 --- a/src/http/mod.rs +++ b/src/http/mod.rs @@ -262,7 +262,7 @@ impl Response { stream.write_all(header.as_bytes())?; if let Some(buf) = buf { - stream.write_all(buf.as_bytes()); + stream.write_all(buf.as_bytes())?; } Ok(()) } diff --git a/src/websocket/mod.rs b/src/websocket/mod.rs index 0fd0172..8fc7d65 100644 --- a/src/websocket/mod.rs +++ b/src/websocket/mod.rs @@ -8,11 +8,11 @@ pub fn connection_handler(client: &mut http::HttpStream, req: &http::Request) { } else { res.status(405); res.add_header("Allow", "GET"); - res.send(&mut client.stream); + res.send(&mut client.stream).unwrap(); return; } // TODO implement websocket res.status(501); - res.send(&mut client.stream); + res.send(&mut client.stream).unwrap(); }