Remove take_* methods from RequestParts for Version, Method, and Uri (#151)

* Remove `RequestParts::take_method`

* Remove `RequestParts::take_uri`

* Remove `RequestParts::take_version`

CHANGELOG.md

@@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   required for returning responses with bodies other than `hyper::Body` from
   handlers. See the docs for advice on how to implement `IntoResponse` ([#86](https://github.com/tokio-rs/axum/pull/86))
 - Change WebSocket API to use an extractor ([#121](https://github.com/tokio-rs/axum/pull/121))
-- Make WebSocket Message an enum ([#116](https://github.com/tokio-rs/axum/pull/116))
+- Make WebSocket `Message` an enum ([#116](https://github.com/tokio-rs/axum/pull/116))
 - Add `RoutingDsl::or` for combining routes. ([#108](https://github.com/tokio-rs/axum/pull/108))
 - Ensure a `HandleError` service created from `axum::ServiceExt::handle_error`
   _does not_ implement `RoutingDsl` as that could lead to confusing routing
@@ -33,6 +33,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - `ExtractorMiddlewareLayer`
 - Replace `axum::body::BoxStdError` with `axum::Error`, which supports downcasting ([#150](https://github.com/tokio-rs/axum/pull/150))
 - `WebSocket` now uses `axum::Error` as its error type ([#150](https://github.com/tokio-rs/axum/pull/150))
+- `RequestParts` changes:
+    - `method` new returns an `&http::Method`
+    - `method_mut` new returns an `&mut http::Method`
+    - `take_method` has been removed
+    - `uri` new returns an `&http::Uri`
+    - `uri_mut` new returns an `&mut http::Uri`
+    - `take_uri` has been removed
+- These rejections have been removed as they're no longer used
+    - `MethodAlreadyExtracted`
+    - `UriAlreadyExtracted`
+    - `VersionAlreadyExtracted`
 
 # 0.1.3 (06. August, 2021)
 

src/extract/form.rs

@@ -51,12 +51,8 @@ where
 
     #[allow(warnings)]
     async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
-        if req.method().ok_or(MethodAlreadyExtracted)? == Method::GET {
+        if req.method() == Method::GET {
-            let query = req
+            let query = req.uri().query().unwrap_or_default();
-                .uri()
-                .ok_or(UriAlreadyExtracted)?
-                .query()
-                .unwrap_or_default();
             let value = serde_urlencoded::from_str(query)
                 .map_err(FailedToDeserializeQueryString::new::<T, _>)?;
             Ok(Form(value))

src/extract/mod.rs

@@ -368,9 +368,9 @@ pub trait FromRequest<B = crate::body::Body>: Sized {
 /// Has several convenience methods for getting owned parts of the request.
 #[derive(Debug)]
 pub struct RequestParts<B = crate::body::Body> {
-    method: Option<Method>,
+    method: Method,
-    uri: Option<Uri>,
+    uri: Uri,
-    version: Option<Version>,
+    version: Version,
     headers: Option<HeaderMap>,
     extensions: Option<Extensions>,
     body: Option<B>,
@@ -391,9 +391,9 @@ impl<B> RequestParts<B> {
         ) = req.into_parts();
 
         RequestParts {
-            method: Some(method),
+            method,
-            uri: Some(uri),
+            uri,
-            version: Some(version),
+            version,
             headers: Some(headers),
             extensions: Some(extensions),
             body: Some(body),
@@ -413,17 +413,9 @@ impl<B> RequestParts<B> {
 
         let mut req = Request::new(body.take().expect("body already extracted"));
 
-        if let Some(method) = method.take() {
+        *req.method_mut() = method.clone();
-            *req.method_mut() = method;
+        *req.uri_mut() = uri.clone();
-        }
+        *req.version_mut() = *version;
-
-        if let Some(uri) = uri.take() {
-            *req.uri_mut() = uri;
-        }
-
-        if let Some(version) = version.take() {
-            *req.version_mut() = version;
-        }
 
         if let Some(headers) = headers.take() {
             *req.headers_mut() = headers;
@@ -436,61 +428,34 @@ impl<B> RequestParts<B> {
         req
     }
 
-    /// Gets a reference to the request method.
+    /// Gets a reference the request method.
-    ///
+    pub fn method(&self) -> &Method {
-    /// Returns `None` if the method has been taken by another extractor.
+        &self.method
-    pub fn method(&self) -> Option<&Method> {
-        self.method.as_ref()
     }
 
     /// Gets a mutable reference to the request method.
-    ///
+    pub fn method_mut(&mut self) -> &mut Method {
-    /// Returns `None` if the method has been taken by another extractor.
+        &mut self.method
-    pub fn method_mut(&mut self) -> Option<&mut Method> {
-        self.method.as_mut()
     }
 
-    /// Takes the method out of the request, leaving a `None` in its place.
+    /// Gets a reference the request URI.
-    pub fn take_method(&mut self) -> Option<Method> {
+    pub fn uri(&self) -> &Uri {
-        self.method.take()
+        &self.uri
-    }
-
-    /// Gets a reference to the request URI.
-    ///
-    /// Returns `None` if the URI has been taken by another extractor.
-    pub fn uri(&self) -> Option<&Uri> {
-        self.uri.as_ref()
     }
 
     /// Gets a mutable reference to the request URI.
-    ///
+    pub fn uri_mut(&mut self) -> &mut Uri {
-    /// Returns `None` if the URI has been taken by another extractor.
+        &mut self.uri
-    pub fn uri_mut(&mut self) -> Option<&mut Uri> {
-        self.uri.as_mut()
     }
 
-    /// Takes the URI out of the request, leaving a `None` in its place.
+    /// Get the request HTTP version.
-    pub fn take_uri(&mut self) -> Option<Uri> {
+    pub fn version(&self) -> Version {
-        self.uri.take()
-    }
-
-    /// Gets a reference to the request HTTP version.
-    ///
-    /// Returns `None` if the HTTP version has been taken by another extractor.
-    pub fn version(&self) -> Option<Version> {
         self.version
     }
 
     /// Gets a mutable reference to the request HTTP version.
-    ///
+    pub fn version_mut(&mut self) -> &mut Version {
-    /// Returns `None` if the HTTP version has been taken by another extractor.
+        &mut self.version
-    pub fn version_mut(&mut self) -> Option<&mut Version> {
-        self.version.as_mut()
-    }
-
-    /// Takes the HTTP version out of the request, leaving a `None` in its place.
-    pub fn take_version(&mut self) -> Option<Version> {
-        self.version.take()
     }
 
     /// Gets a reference to the request headers.

src/extract/query.rs

@@ -47,11 +47,7 @@ where
     type Rejection = QueryRejection;
 
     async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
-        let query = req
+        let query = req.uri().query().unwrap_or_default();
-            .uri()
-            .ok_or(UriAlreadyExtracted)?
-            .query()
-            .unwrap_or_default();
         let value = serde_urlencoded::from_str(query)
             .map_err(FailedToDeserializeQueryString::new::<T, _>)?;
         Ok(Query(value))

src/extract/raw_query.rs

@@ -30,10 +30,7 @@ where
     type Rejection = Infallible;
 
     async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
-        let query = req
+        let query = req.uri().query().map(|query| query.to_string());
-            .uri()
-            .and_then(|uri| uri.query())
-            .map(|query| query.to_string());
         Ok(Self(query))
     }
 }

src/extract/rejection.rs

@@ -10,27 +10,6 @@ use http_body::Full;
 use std::convert::Infallible;
 use tower::BoxError;
 
-define_rejection! {
-    #[status = INTERNAL_SERVER_ERROR]
-    #[body = "Version taken by other extractor"]
-    /// Rejection used if the HTTP version has been taken by another extractor.
-    pub struct VersionAlreadyExtracted;
-}
-
-define_rejection! {
-    #[status = INTERNAL_SERVER_ERROR]
-    #[body = "URI taken by other extractor"]
-    /// Rejection used if the URI has been taken by another extractor.
-    pub struct UriAlreadyExtracted;
-}
-
-define_rejection! {
-    #[status = INTERNAL_SERVER_ERROR]
-    #[body = "Method taken by other extractor"]
-    /// Rejection used if the method has been taken by another extractor.
-    pub struct MethodAlreadyExtracted;
-}
-
 define_rejection! {
     #[status = INTERNAL_SERVER_ERROR]
     #[body = "Extensions taken by other extractor"]
@@ -222,7 +201,6 @@ composite_rejection! {
     /// Contains one variant for each way the [`Query`](super::Query) extractor
     /// can fail.
     pub enum QueryRejection {
-        UriAlreadyExtracted,
         FailedToDeserializeQueryString,
     }
 }
@@ -237,9 +215,7 @@ composite_rejection! {
         FailedToDeserializeQueryString,
         FailedToBufferBody,
         BodyAlreadyExtracted,
-        UriAlreadyExtracted,
         HeadersAlreadyExtracted,
-        MethodAlreadyExtracted,
     }
 }
 

src/extract/request_parts.rs

@@ -4,6 +4,7 @@ use bytes::Bytes;
 use futures_util::stream::Stream;
 use http::{HeaderMap, Method, Request, Uri, Version};
 use std::{
+    convert::Infallible,
     pin::Pin,
     task::{Context, Poll},
 };
@@ -18,21 +19,15 @@ where
 
     async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
         let RequestParts {
-            method,
+            method: _,
-            uri,
+            uri: _,
-            version,
+            version: _,
             headers,
             extensions,
             body,
         } = req;
 
-        let all_parts = method
+        let all_parts = extensions.as_ref().zip(body.as_ref()).zip(headers.as_ref());
-            .as_ref()
-            .zip(version.as_ref())
-            .zip(uri.as_ref())
-            .zip(extensions.as_ref())
-            .zip(body.as_ref())
-            .zip(headers.as_ref());
 
         if all_parts.is_some() {
             Ok(req.into_request())
@@ -60,10 +55,10 @@ impl<B> FromRequest<B> for Method
 where
     B: Send,
 {
-    type Rejection = MethodAlreadyExtracted;
+    type Rejection = Infallible;
 
     async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
-        req.take_method().ok_or(MethodAlreadyExtracted)
+        Ok(req.method().clone())
     }
 }
 
@@ -72,10 +67,10 @@ impl<B> FromRequest<B> for Uri
 where
     B: Send,
 {
-    type Rejection = UriAlreadyExtracted;
+    type Rejection = Infallible;
 
     async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
-        req.take_uri().ok_or(UriAlreadyExtracted)
+        Ok(req.uri().clone())
     }
 }
 
@@ -84,10 +79,10 @@ impl<B> FromRequest<B> for Version
 where
     B: Send,
 {
-    type Rejection = VersionAlreadyExtracted;
+    type Rejection = Infallible;
 
     async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
-        req.take_version().ok_or(VersionAlreadyExtracted)
+        Ok(req.version())
     }
 }
 

src/extract/ws.rs

@@ -167,7 +167,7 @@ where
     type Rejection = WebSocketUpgradeRejection;
 
     async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
-        if req.method().ok_or(MethodAlreadyExtracted)? != Method::GET {
+        if req.method() != Method::GET {
             return Err(MethodNotGet.into());
         }
 
@@ -572,7 +572,6 @@ pub mod rejection {
             InvalidUpgradeHeader,
             InvalidWebsocketVersionHeader,
             WebsocketKeyHeaderMissing,
-            MethodAlreadyExtracted,
             HeadersAlreadyExtracted,
             ExtensionsAlreadyExtracted,
         }