Merge branch 'release/v2.0.0'

gsserge · gsserge · commit d68fa45ad20d · 2021-05-18T16:18:57.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "routerify-multipart"
-version = "1.1.0"
+version = "2.0.0"
 description = "A multipart/form-data parser for Routerify."
 homepage = "https://github.com/routerify/routerify-multipart"
 repository = "https://github.com/routerify/routerify-multipart"
@@ -23,9 +23,9 @@ all = ["json"]
 json = ["multer/json"]
 
 [dependencies]
-routerify = "1.1"
-hyper = "0.13"
-multer = "1.2"
+routerify = "2"
+hyper = "0.14"
+multer = "2"
 
 [dev-dependencies]
-tokio = { version = "0.2", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
diff --git a/README.md b/README.md
@@ -17,8 +17,8 @@ Add this to your `Cargo.toml` file:
 
 ```toml
 [dependencies]
-routerify = "1.1"
-routerify-multipart = "1.1"
+routerify = "2"
+routerify-multipart = "2"
 ```
 
 ## Example
diff --git a/examples/test.rs b/examples/test.rs
@@ -4,7 +4,7 @@ use routerify_multipart::RequestMultipartExt;
 use std::net::SocketAddr;
 
 async fn file_upload_handler(req: Request<Body>) -> Result<Response<Body>, Error> {
-    let mut multipart = req.into_multipart().map_err(|err| Error::wrap(err))?;
+    let mut multipart = req.into_multipart().map_err(|err| Error::new(err.to_string()))?;
 
     while let Some(field) = multipart.next_field().await.map_err(|err| Error::wrap(err))? {
         let name = field.name();
diff --git a/src/ext.rs b/src/ext.rs
@@ -1,26 +1,26 @@
 use crate::{Constraints, Multipart};
 use hyper::{header, Request};
 
-/// An extension trait which extends [`hyper::Request<Body>`](https://docs.rs/hyper/0.13.5/hyper/struct.Request.html)
+/// An extension trait which extends [`hyper::Request<Body>`](https://docs.rs/hyper/0.14.7/hyper/struct.Request.html)
 /// to add some methods to parse request body as `multipart/form-data`.
 pub trait RequestMultipartExt {
     /// Convert the request body to [`Multipart`](./struct.Multipart.html) if the `content-type` is `multipart/form-data`.
     ///
     /// # Errors
     ///
     /// This method fails if the request body is not `multipart/form-data` and in this case, you could send a `400 Bad Request` status.
-    fn into_multipart(self) -> routerify::Result<Multipart>;
+    fn into_multipart(self) -> routerify::Result<Multipart<'static>>;
 
     /// Convert the request body to [`Multipart`](./struct.Multipart.html) if the `content-type` is `multipart/form-data` with some [constraints](./struct.Constraints.html).
     ///
     /// # Errors
     ///
     /// This method fails if the request body is not `multipart/form-data` and in this case, you could send a `400 Bad Request` status.
-    fn into_multipart_with_constraints(self, constraints: Constraints) -> routerify::Result<Multipart>;
+    fn into_multipart_with_constraints(self, constraints: Constraints) -> routerify::Result<Multipart<'static>>;
 }
 
 impl RequestMultipartExt for Request<hyper::Body> {
-    fn into_multipart(self) -> routerify::Result<Multipart> {
+    fn into_multipart(self) -> routerify::Result<Multipart<'static>> {
         let boundary = self
             .headers()
             .get(header::CONTENT_TYPE)
@@ -30,21 +30,25 @@ impl RequestMultipartExt for Request<hyper::Body> {
         if let Some(boundary) = boundary {
             Ok(Multipart::new(self.into_body(), boundary))
         } else {
-            Err(routerify::Error::new("Content-Type is not multipart/form-data"))
+            Err(Box::new(routerify::Error::new(
+                "Content-Type is not multipart/form-data",
+            )))
         }
     }
 
-    fn into_multipart_with_constraints(self, constraints: Constraints) -> routerify::Result<Multipart> {
+    fn into_multipart_with_constraints(self, constraints: Constraints) -> routerify::Result<Multipart<'static>> {
         let boundary = self
             .headers()
             .get(header::CONTENT_TYPE)
             .and_then(|val| val.to_str().ok())
             .and_then(|val| multer::parse_boundary(val).ok());
 
         if let Some(boundary) = boundary {
-            Ok(Multipart::new_with_constraints(self.into_body(), boundary, constraints))
+            Ok(Multipart::with_constraints(self.into_body(), boundary, constraints))
         } else {
-            Err(routerify::Error::new("Content-Type is not multipart/form-data"))
+            Err(Box::new(routerify::Error::new(
+                "Content-Type is not multipart/form-data",
+            )))
         }
     }
 }
