remove anyhow requirement

Author: stevefan1999-personal

Cargo.toml

@@ -11,7 +11,6 @@ categories = ["embedded", "no-std", "network-programming"]
 readme = "README.md"
 
 [dependencies]
-anyhow = "1.0.58"
 async-std = { version = "1.12.0", optional = true }
 base64 = { version = "0.13.0", default-features = false }
 base64-simd = { version = "0.5.0", default-features = false, optional = true }

examples/client/main.rs

@@ -19,9 +19,7 @@ fn main() -> Result<(), FramerError> {
     // open a TCP stream to localhost port 1337
     let address = "127.0.0.1:1337";
     println!("Connecting to: {}", address);
-    let mut stream = TcpStream::connect(address)
-        .map_err(anyhow::Error::new)
-        .map_err(FramerError::Io)?;
+    let mut stream = TcpStream::connect(address).map_err(FramerError::Io)?;
     println!("Connected.");
 
     let mut read_buf = [0; 4000];

examples/client_async/main.rs

@@ -31,10 +31,7 @@ async fn main() -> Result<(), FramerError> {
     // open a TCP stream to localhost port 1337
     let address = "127.0.0.1:1337";
     println!("Connecting to: {}", address);
-    let mut stream = TcpStream::connect(address)
-        .await
-        .map_err(anyhow::Error::new)
-        .map_err(FramerError::Io)?;
+    let mut stream = TcpStream::connect(address).await.map_err(FramerError::Io)?;
     println!("Connected.");
 
     let mut read_buf = [0; 4000];

src/framer.rs

@@ -37,11 +37,11 @@ pub enum ReadResult<'a> {
 
 #[derive(Debug)]
 pub enum FramerError {
+    Io(core2::io::Error),
     FrameTooLarge(usize),
     Utf8(Utf8Error),
     HttpHeader(httparse::Error),
     WebSocket(crate::Error),
-    Io(anyhow::Error),
 }
 
 pub struct Framer<'a, TRng, TWebSocketType>
@@ -72,15 +72,13 @@ where
             .map_err(FramerError::WebSocket)?;
         stream
             .write_all(&self.write_buf[..len])
-            .map_err(anyhow::Error::new)
             .map_err(FramerError::Io)?;
         *self.read_cursor = 0;
 
         loop {
             // read the response from the server and check it to complete the opening handshake
             let received_size = stream
                 .read(&mut self.read_buf[*self.read_cursor..])
-                .map_err(anyhow::Error::new)
                 .map_err(FramerError::Io)?;
 
             match self.websocket.client_accept(
@@ -119,7 +117,6 @@ where
 
         stream
             .write_all(&self.write_buf[..len])
-            .map_err(anyhow::Error::new)
             .map_err(FramerError::Io)?;
         Ok(())
     }
@@ -182,7 +179,6 @@ where
         let len = self.close_len(close_status, status_description)?;
         stream
             .write_all(&self.write_buf[..len])
-            .map_err(anyhow::Error::new)
             .map_err(FramerError::Io)?;
         Ok(())
     }
@@ -208,7 +204,6 @@ where
         let len = self.write_len(message_type, end_of_message, frame_buf)?;
         stream
             .write_all(&self.write_buf[..len])
-            .map_err(anyhow::Error::new)
             .map_err(FramerError::Io)?;
         Ok(())
     }
@@ -223,10 +218,7 @@ where
     ) -> Result<ReadResult<'b>, FramerError> {
         loop {
             if *self.read_cursor == 0 || *self.read_cursor == self.read_len {
-                self.read_len = stream
-                    .read(self.read_buf)
-                    .map_err(anyhow::Error::new)
-                    .map_err(FramerError::Io)?;
+                self.read_len = stream.read(self.read_buf).map_err(FramerError::Io)?;
                 *self.read_cursor = 0;
             }
 
@@ -309,7 +301,6 @@ where
         let len = self.send_back_data(&frame_buf, len_to, send_message_type)?;
         stream
             .write_all(&self.write_buf[..len])
-            .map_err(anyhow::Error::new)
             .map_err(FramerError::Io)?;
         Ok(())
     }
@@ -345,7 +336,6 @@ where
         stream
             .write_all(&self.write_buf[..len])
             .await
-            .map_err(anyhow::Error::new)
             .map_err(FramerError::Io)?;
         *self.read_cursor = 0;
 
@@ -354,7 +344,6 @@ where
             let received_size = stream
                 .read(&mut self.read_buf[*self.read_cursor..])
                 .await
-                .map_err(anyhow::Error::new)
                 .map_err(FramerError::Io)?;
 
             match self.websocket.client_accept(
@@ -395,7 +384,6 @@ where
         stream
             .write_all(&self.write_buf[..len])
             .await
-            .map_err(anyhow::Error::new)
             .map_err(FramerError::Io)?;
         Ok(())
     }
@@ -418,7 +406,6 @@ where
         stream
             .write_all(&self.write_buf[..len])
             .await
-            .map_err(anyhow::Error::new)
             .map_err(FramerError::Io)?;
         Ok(())
     }
@@ -435,7 +422,6 @@ where
         stream
             .write_all(&self.write_buf[..len])
             .await
-            .map_err(anyhow::Error::new)
             .map_err(FramerError::Io)?;
         Ok(())
     }
@@ -447,11 +433,7 @@ where
     ) -> Result<ReadResult<'b>, FramerError> {
         loop {
             if *self.read_cursor == 0 || *self.read_cursor == self.read_len {
-                self.read_len = stream
-                    .read(self.read_buf)
-                    .await
-                    .map_err(anyhow::Error::new)
-                    .map_err(FramerError::Io)?;
+                self.read_len = stream.read(self.read_buf).await.map_err(FramerError::Io)?;
                 *self.read_cursor = 0;
             }
 
@@ -537,7 +519,6 @@ where
         stream
             .write_all(&self.write_buf[..len])
             .await
-            .map_err(anyhow::Error::new)
             .map_err(FramerError::Io)?;
         Ok(())
     }

src/http.rs

@@ -145,7 +145,6 @@ pub fn build_connect_handshake_request(
         }
     }
 
-    
     let sec_websocket_key: String<24> = String::from(str::from_utf8(&key_as_base64)?);
 
     http_request.push_str("GET ")?;