Clean up models module

Author: kyleect

README.md

@@ -4,10 +4,13 @@ Parse partial/non spec compliant HTTP messages.
 
 ## Partial HTTP Message
 
-A partial HTTP message contains the potential spans for `method`, `uri`, `http_version`, `headers`, and `body`. The HTTP message does not need to be spec compliant so things like `http_version` are optional.
+A `PartialHttpRequest` contains the potential spans for `method`, `uri`, `http_version`, `headers`, and `body`. The HTTP message does not need to be spec compliant so things like `http_version` are optional.
 
 ```rust
-use http_message::{PartialHttpRequest, error::Error, models::request::HttpRequest};
+use http_message::{
+    error::Error,
+    models::{HttpRequest, PartialHttpRequest},
+};
 
 fn main() {
     let partial = PartialHttpRequest::from_str("GET https://example.com\nx-key: 123").unwrap();
@@ -28,14 +31,15 @@ fn main() {
 
     assert_eq!(Err(Error::missing_required("http_version")), request);
 }
+
 ```
 
 ## Parsed HTTP Message
 
-A parsed HTTP message contains the spans for `method`, `uri`, `http_version`, `headers`, and `body`. The HTTP message does need to be spec compliant so things like `http_version` are required.
+A `ParsedHttpRequest` contains the spans for `method`, `uri`, `http_version`, `headers`, and `body`. The HTTP message does need to be spec compliant so things like `http_version` are required.
 
 ```rust
-use http_message::models::{parsed_request::ParsedHttpRequest, request::HttpRequest, uri::Uri};
+use http_message::models::{HttpRequest, ParsedHttpRequest, Uri};
 
 fn main() {
     let parsed =

examples/parsed.rs

@@ -1,4 +1,4 @@
-use http_message::models::{parsed_request::ParsedHttpRequest, request::HttpRequest, uri::Uri};
+use http_message::models::{HttpRequest, ParsedHttpRequest, Uri};
 
 fn main() {
     let parsed =

examples/partial.rs

@@ -1,4 +1,7 @@
-use http_message::{PartialHttpRequest, error::Error, models::request::HttpRequest};
+use http_message::{
+    error::Error,
+    models::{HttpRequest, PartialHttpRequest},
+};
 
 fn main() {
     let partial = PartialHttpRequest::from_str("GET https://example.com\nx-key: 123").unwrap();

src/lib.rs

@@ -1,5 +1,3 @@
 pub mod error;
 pub mod models;
 pub mod span;
-
-pub use models::partial_request::PartialHttpRequest;

src/main.rs

@@ -1,3 +1,5 @@
+use http_message::models::PartialHttpRequest;
+
 fn main() {
     use std::env;
     use std::fs;
@@ -11,7 +13,7 @@ fn main() {
 
     match fs::read_to_string(&args[1]) {
         Ok(contents) => {
-            let partial = http_message::PartialHttpRequest::from_str(&contents);
+            let partial = PartialHttpRequest::from_str(&contents);
 
             println!("{partial:#?}");
         }

src/models/headers.rs

@@ -50,15 +50,6 @@ impl From<&str> for HttpHeader {
     }
 }
 
-pub trait HttpHeaders {
-    type Header;
-
-    fn headers(&self) -> Vec<Self::Header>;
-    fn get_header(&self, key: &str) -> Option<Self::Header>;
-    fn get_header_mut(&mut self, key: &str) -> Option<&mut Self::Header>;
-    fn set_header(&mut self, key: &str, value: &str);
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/models/mod.rs

@@ -1,8 +1,17 @@
-pub mod body;
-pub mod headers;
-pub mod parsed_request;
-pub mod partial_request;
-pub mod request;
-pub mod response;
-pub mod uri;
-pub mod version;
+mod body;
+mod headers;
+mod parsed_request;
+mod partial_request;
+mod request;
+mod response;
+mod uri;
+mod version;
+
+pub use body::{HttpBody, PossibleHttpBody};
+pub use headers::HttpHeader;
+pub use parsed_request::ParsedHttpRequest;
+pub use partial_request::PartialHttpRequest;
+pub use request::{HttpMethod, HttpRequest};
+pub use response::{HttpResponse, HttpStatusCode};
+pub use uri::Uri;
+pub use version::HttpVersion;

src/models/partial_request.rs

@@ -291,9 +291,8 @@ fn get_span_extent_from_spans(body_spans: Option<Vec<Range<usize>>>) -> Option<R
 #[cfg(test)]
 mod tests {
     use crate::{
-        PartialHttpRequest,
         error::Error,
-        models::{request::HttpRequest, uri::Uri},
+        models::{HttpRequest, PartialHttpRequest, Uri},
     };
 
     #[test]

src/models/request.rs

@@ -1,12 +1,8 @@
 use crate::{
     error::Error,
     models::{
-        body::{HttpBody, PossibleHttpBody},
-        headers::HttpHeader,
-        parsed_request::ParsedHttpRequest,
-        partial_request::PartialHttpRequest,
-        uri::Uri,
-        version::HttpVersion,
+        HttpBody, HttpHeader, HttpVersion, ParsedHttpRequest, PartialHttpRequest, PossibleHttpBody,
+        Uri,
     },
 };
 

tests/display_tests.rs

@@ -1,6 +1,6 @@
 use std::fs;
 
-use http_message::PartialHttpRequest;
+use http_message::models::PartialHttpRequest;
 
 use pretty_assertions::assert_eq;