Change method sigature to put method before uri

Author: kyleect

src/models/partial_request.rs

@@ -18,8 +18,8 @@ pub struct PartialHttpRequest {
 impl PartialHttpRequest {
     pub fn new(
         message: &str,
-        uri: Option<Range<usize>>,
         method: Option<Range<usize>>,
+        uri: Option<Range<usize>>,
         http_version: Option<Range<usize>>,
         headers: Vec<Range<usize>>,
         body: Option<Range<usize>>,
@@ -154,8 +154,8 @@ where
 
     Ok(PartialHttpRequest::new(
         input,
-        uri,
         method,
+        uri,
         http_version,
         header_spans,
         body_span,
@@ -236,8 +236,8 @@ mod tests {
         assert_eq!(
             PartialHttpRequest::new(
                 "GET https://example.com HTTP/1.1",
-                Some(4..23),
                 Some(0..3),
+                Some(4..23),
                 Some(24..32),
                 vec![],
                 None

src/models/request.rs

@@ -129,8 +129,8 @@ mod from_partial_request_tests {
         GET https://example.com HTTP/1.1
         x-api-key: abc123
         "#,
-            Some(13..32),
             Some(9..12),
+            Some(13..32),
             Some(33..41),
             vec![50..67],
             None,

tests/parse_tests.rs

@@ -41,8 +41,8 @@ fn parse_get_request() {
     assert_eq!(
         PartialHttpRequest::new(
             include_str!("../tests/fixtures/get.request"),
-            Some(4..23),
             Some(0..3),
+            Some(4..23),
             Some(24..32),
             vec![],
             None
@@ -74,8 +74,8 @@ fn parse_get_without_http_version_request() {
     assert_eq!(
         PartialHttpRequest::new(
             include_str!("../tests/fixtures/get_without_http_version.request"),
-            Some(4..23),
             Some(0..3),
+            Some(4..23),
             None,
             vec![],
             None
@@ -107,8 +107,8 @@ fn parse_get_with_headers_request() {
     assert_eq!(
         PartialHttpRequest::new(
             include_str!("../tests/fixtures/get_with_headers.request"),
-            Some(4..23),
             Some(0..3),
+            Some(4..23),
             Some(24..32),
             vec![33..51],
             None
@@ -144,7 +144,7 @@ fn parse_post_with_headers_and_body_request() {
     let body = Some(53..64);
 
     assert_eq!(
-        PartialHttpRequest::new(&content, uri, method, http_version, headers, body),
+        PartialHttpRequest::new(&content, method, uri, http_version, headers, body),
         partial
     );
 
@@ -172,8 +172,8 @@ fn parse_post_with_body_request() {
     assert_eq!(
         PartialHttpRequest::new(
             include_str!("../tests/fixtures/post_with_body.request"),
-            Some(5..24),
             Some(0..4),
+            Some(5..24),
             Some(25..33),
             vec![],
             Some(35..46)
@@ -205,8 +205,8 @@ fn parse_get_with_multiple_spaces_request() {
     assert_eq!(
         PartialHttpRequest::new(
             &content,
-            Some(5..24),
             Some(0..3),
+            Some(5..24),
             Some(26..34),
             vec![],
             None