fix body methods, add replace_body

yoshuawuyts · yoshuawuyts · commit b101271da4fd · 2020-01-09T23:42:11.000+01:00
Signed-off-by: Yoshua Wuyts &lt;yoshuawuyts@gmail.com&gt;
diff --git a/src/request.rs b/src/request.rs
@@ -126,31 +126,45 @@ impl Request {
     /// # Examples
     ///
     /// ```
-    /// use http_types::{Url, Method, Request};
+    /// use http_types::{Body, Url, Method, Request};
     ///
     /// let mut req = Request::new(Method::Get, Url::parse("https://example.com").unwrap());
     /// req.set_body("hello world");
-    /// let _body: Body = req.swap_body("hello planet");
+    /// let _body: Body = req.replace_body("hello planet");
     /// ```
-    pub fn swap_body(&mut self, body: impl Into<Body>) -> Body {
-        let mut body = body.into();
-        mem::swap(&mut self.body, &mut body);
-        body
+    pub fn replace_body(&mut self, body: impl Into<Body>) -> Body {
+        mem::replace(&mut self.body, body.into())
+    }
+
+    /// Replace the request body with a new body, and return the old body.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use http_types::{Body, Url, Method, Request};
+    ///
+    /// let mut req = Request::new(Method::Get, Url::parse("https://example.com").unwrap());
+    /// req.set_body("hello world");
+    /// let mut body = "hello planet".into();
+    /// req.swap_body(&mut body);
+    /// ```
+    pub fn swap_body(&mut self, body: &mut Body) {
+        mem::swap(&mut self.body, body);
     }
 
     /// Take the request body, replacing it with an empty body.
     ///
     /// # Examples
     ///
     /// ```
-    /// use http_types::{Url, Method, Request};
+    /// use http_types::{Body, Url, Method, Request};
     ///
     /// let mut req = Request::new(Method::Get, Url::parse("https://example.com").unwrap());
     /// req.set_body("hello world");
     /// let _body: Body = req.take_body();
     /// ```
     pub fn take_body(&mut self) -> Body {
-        self.swap_body(Body::empty())
+        self.replace_body(Body::empty())
     }
 
     /// Get an HTTP header.
diff --git a/src/response.rs b/src/response.rs
@@ -109,26 +109,46 @@ impl Response {
         }
     }
 
-    /// Replace the request body with a new body, and return the old body.
+    /// Replace the request body with a new body, returning the old body.
     ///
+    /// # Examples
+    ///
+    /// ```
+    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// #
+    /// use http_types::{Body, Url, Method, Request};
+    ///
+    /// let mut req = Request::new(Method::Get, Url::parse("https://example.com")?);
+    /// req.set_body("Hello, Nori!");
+    ///
+    /// let body: Body = req.replace_body("Hello, Chashu");
+    /// #
+    /// # Ok(()) }
+    /// ```
+    pub fn replace_body(&mut self, body: impl Into<Body>) -> Body {
+        mem::replace(&mut self.body, body.into())
+    }
+
+    /// Swaps the value of the body with another body, without deinitializing
+    /// either one.
     ///
     /// # Examples
     ///
     /// ```
     /// # fn main() -> Result<(), http_types::url::ParseError> {
     /// #
-    /// use http_types::{Url, Method, Request};
+    /// use http_types::{Body, Url, Method, Request};
     ///
     /// let mut req = Request::new(Method::Get, Url::parse("https://example.com")?);
     /// req.set_body("Hello, Nori!");
-    /// let _body: Body = req.swap_body("Hello, Chashu!");
+    ///
+    /// let mut body = "Hello, Chashu".into();
+    /// req.swap_body(&mut body);
     /// #
     /// # Ok(()) }
     /// ```
-    pub fn swap_body(&mut self, body: impl Into<Body>) -> Body {
-        let mut body = body.into();
-        mem::swap(&mut self.body, &mut body);
-        body
+    pub fn swap_body(&mut self, body: &mut Body) {
+        mem::swap(&mut self.body, body);
     }
 
     /// Take the request body, replacing it with an empty body.
@@ -138,7 +158,7 @@ impl Response {
     /// ```
     /// # fn main() -> Result<(), http_types::url::ParseError> {
     /// #
-    /// use http_types::{Url, Method, Request};
+    /// use http_types::{Body, Url, Method, Request};
     ///
     /// let mut req = Request::new(Method::Get, Url::parse("https://example.com")?);
     /// req.set_body("Hello, Nori!");
@@ -147,7 +167,7 @@ impl Response {
     /// # Ok(()) }
     /// ```
     pub fn take_body(&mut self) -> Body {
-        self.swap_body(Body::empty())
+        self.replace_body(Body::empty())
     }
 
     /// Set the response MIME.
