use separated mod for system tools

src/lib.rs

@@ -6,26 +6,4 @@ pub use response::Response;
 
 pub const HEADER_MAX_LEN: usize = 1024;
 
-trait Header {
-    fn header_bytes(&self) -> Result<&[u8]>;
-}
-
-impl Header for &[u8] {
-    fn header_bytes(&self) -> Result<&[u8]> {
-        match self.iter().position(|&b| b == b'\r') {
-            Some(n) => {
-                if n > HEADER_MAX_LEN {
-                    bail!("Header bytes length reached")
-                }
-                if self.get(n + 1).is_some_and(|&b| b == b'\n') {
-                    Ok(&self[..n])
-                } else {
-                    bail!("LF byte not found")
-                }
-            }
-            None => bail!("CR byte not found"),
-        }
-    }
-}
-
-use anyhow::{bail, Result};
+mod tool;

src/request/gemini.rs

@@ -8,7 +8,7 @@ pub struct Gemini {
 
 impl Gemini {
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         Ok(Self {
             url: Url::parse(std::str::from_utf8(buffer.header_bytes()?)?)?,
         })

src/request/titan/meta.rs

@@ -8,7 +8,7 @@ pub struct Meta {
 
 impl Meta {
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         use regex::Regex;
         let header = from_utf8(buffer.header_bytes()?)?;
         Ok(Self {

src/response/certificate/expected.rs

@@ -11,7 +11,7 @@ impl Expected {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/certificate/not_authorized.rs

@@ -11,7 +11,7 @@ impl NotAuthorized {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/certificate/not_valid.rs

@@ -11,7 +11,7 @@ impl NotValid {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/failure/permanent/bad_request.rs

@@ -11,7 +11,7 @@ impl BadRequest {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/failure/permanent/general.rs

@@ -11,7 +11,7 @@ impl General {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/failure/permanent/gone.rs

@@ -11,7 +11,7 @@ impl Gone {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/failure/permanent/not_found.rs

@@ -11,7 +11,7 @@ impl NotFound {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/failure/permanent/proxy_request_refused.rs

@@ -11,7 +11,7 @@ impl ProxyRequestRefused {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/failure/temporary/cgi_error.rs

@@ -11,7 +11,7 @@ impl CgiError {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/failure/temporary/general.rs

@@ -11,7 +11,7 @@ impl General {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/failure/temporary/proxy_error.rs

@@ -11,7 +11,7 @@ impl ProxyError {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/failure/temporary/server_unavailable.rs

@@ -11,7 +11,7 @@ impl ServerUnavailable {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/failure/temporary/slow_down.rs

@@ -11,7 +11,7 @@ impl SlowDown {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/input/default.rs

@@ -11,7 +11,7 @@ impl Default {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/input/sensitive.rs

@@ -11,7 +11,7 @@ impl Sensitive {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/redirect/permanent.rs

@@ -11,7 +11,7 @@ impl Permanent {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/redirect/temporary.rs

@@ -11,7 +11,7 @@ impl Temporary {
     /// Build `Self` from UTF-8 header bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         let h = buffer.header_bytes()?;
         if h.get(..2)
             .is_none_or(|c| c[0] != CODE[0] || c[1] != CODE[1])

src/response/success/default/meta.rs

@@ -8,7 +8,7 @@ impl Meta {
     /// Build `Self` from UTF-8 meta bytes
     /// * expected buffer includes leading status code, message, CRLF
     pub fn from_bytes(buffer: &[u8]) -> Result<Self> {
-        use crate::Header;
+        use crate::tool::Header;
         use regex::Regex;
         use std::str::from_utf8;
         let h = buffer.header_bytes()?;

src/tool.rs

@@ -0,0 +1,23 @@
+pub trait Header {
+    fn header_bytes(&self) -> Result<&[u8]>;
+}
+
+impl Header for &[u8] {
+    fn header_bytes(&self) -> Result<&[u8]> {
+        match self.iter().position(|&b| b == b'\r') {
+            Some(n) => {
+                if n > crate::HEADER_MAX_LEN {
+                    bail!("Header bytes length reached")
+                }
+                if self.get(n + 1).is_some_and(|&b| b == b'\n') {
+                    Ok(&self[..n])
+                } else {
+                    bail!("LF byte not found")
+                }
+            }
+            None => bail!("CR byte not found"),
+        }
+    }
+}
+
+use anyhow::{bail, Result};