User latest actix-web

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "actix-form-data"
 description = "Multipart Form Data for Actix Web"
-version = "0.2.2"
+version = "0.3.0"
 license = "GPL-3.0"
 authors = ["asonix <asonix@asonix.dog>"]
 repository = "https://git.asonix.cloud/asonix/actix-form-data.git"
@@ -12,7 +12,7 @@ keywords = ["actix", "form-data", "multipart", "async"]
 name = "form_data"
 
 [dependencies]
-actix-web = "0.6.0"
+actix-web = "0.7.0"
 bytes = "0.4.7"
 failure = "0.1"
 futures = "0.1.21"
@@ -23,7 +23,7 @@ log = "0.4.1"
 mime = "0.3.5"
 
 [dev-dependencies]
-actix = "0.5.8"
+actix = "0.7.0"
 env_logger = "0.5.9"
 serde = "1.0"
 serde_derive = "1.0"

README.md

@@ -11,8 +11,8 @@ Add it to your dependencies.
 # Cargo.toml
 
 [dependencies]
-actix-web = "0.6.0"
-actix-form-data = "0.2.2"
+actix-web = "0.7.0"
+actix-form-data = "0.3.0"
 ```
 
 Require it in your project.
@@ -74,8 +74,7 @@ impl FilenameGenerator for Gen {
 }
 
 fn upload(
-    req: HttpRequest<Form>,
-    state: State<Form>,
+    (req, state): (HttpRequest<Form>, State<Form>),
 ) -> Box<Future<Item = HttpResponse, Error = Error>> {
     handle_multipart(req.multipart(), state.clone())
         .map(|uploaded_content| {
@@ -101,7 +100,7 @@ fn main() {
 
     server::new(move || {
         App::with_state(form.clone())
-            .resource("/upload", |r| r.method(http::Method::POST).with2(upload))
+            .resource("/upload", |r| r.method(http::Method::POST).with(upload))
     }).bind("127.0.0.1:8080")
         .unwrap()
         .run();

examples/simple.rs

@@ -20,8 +20,7 @@ impl FilenameGenerator for Gen {
 }
 
 fn upload(
-    req: HttpRequest<Form>,
-    state: State<Form>,
+    (req, state): (HttpRequest<Form>, State<Form>),
 ) -> Box<Future<Item = HttpResponse, Error = Error>> {
     handle_multipart(req.multipart(), state.clone())
         .map(|uploaded_content| {
@@ -47,7 +46,7 @@ fn main() {
 
     server::new(move || {
         App::with_state(form.clone())
-            .resource("/upload", |r| r.method(http::Method::POST).with2(upload))
+            .resource("/upload", |r| r.method(http::Method::POST).with(upload))
     }).bind("127.0.0.1:8080")
         .unwrap()
         .run();

examples/upload.rs

@@ -83,8 +83,7 @@ impl ResponseError for Errors {
 }
 
 fn upload(
-    req: HttpRequest<AppState>,
-    state: State<AppState>,
+    (req, state): (HttpRequest<AppState>, State<AppState>),
 ) -> Box<Future<Item = HttpResponse, Error = Errors>> {
     handle_multipart(req.multipart(), state.form.clone())
         .map(|uploaded_content| {
@@ -120,7 +119,7 @@ fn main() {
     server::new(move || {
         App::with_state(state.clone())
             .middleware(Logger::default())
-            .resource("/upload", |r| r.method(http::Method::POST).with2(upload))
+            .resource("/upload", |r| r.method(http::Method::POST).with(upload))
     }).bind("127.0.0.1:8080")
         .unwrap()
         .start();