From 86e0f3e02c4d5f724dbfeec2ee3fe50ca3ac2f10 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Thu, 4 Apr 2019 11:37:14 -0700
Subject: [PATCH] upgrade to alpha3

---
 actix_redis/Cargo.toml        | 2 +-
 actix_todo/Cargo.toml         | 6 +++---
 async_db/Cargo.toml           | 2 +-
 async_ex1/Cargo.toml          | 2 +-
 basics/Cargo.toml             | 6 +++---
 cookie-auth/Cargo.toml        | 2 +-
 cookie-session/Cargo.toml     | 4 ++--
 diesel/Cargo.toml             | 2 +-
 error_handling/Cargo.toml     | 2 +-
 form/Cargo.toml               | 2 +-
 hello-world/Cargo.toml        | 2 +-
 http-full-proxy/Cargo.toml    | 2 +-
 http-full-proxy/src/main.rs   | 2 +-
 http-proxy/Cargo.toml         | 2 +-
 http-proxy/src/main.rs        | 2 +-
 json/Cargo.toml               | 2 +-
 juniper/Cargo.toml            | 2 +-
 middleware/Cargo.toml         | 2 +-
 multipart/Cargo.toml          | 2 +-
 multipart/src/main.rs         | 1 +
 protobuf/Cargo.toml           | 2 +-
 r2d2/Cargo.toml               | 2 +-
 redis-session/Cargo.toml      | 4 ++--
 rustls/Cargo.toml             | 4 ++--
 simple-auth-server/Cargo.toml | 4 ++--
 state/Cargo.toml              | 2 +-
 static_index/Cargo.toml       | 4 ++--
 template_askama/Cargo.toml    | 2 +-
 template_askama/build.rs      | 5 -----
 template_tera/Cargo.toml      | 2 +-
 template_yarte/Cargo.toml     | 6 +++---
 tls/Cargo.toml                | 2 +-
 web-cors/backend/Cargo.toml   | 2 +-
 websocket-chat/Cargo.toml     | 6 +++---
 websocket-tcp-chat/Cargo.toml | 6 +++---
 websocket/Cargo.toml          | 6 +++---
 36 files changed, 52 insertions(+), 56 deletions(-)
 delete mode 100644 template_askama/build.rs

diff --git a/actix_redis/Cargo.toml b/actix_redis/Cargo.toml
index 7c762a61..38a2daa8 100644
--- a/actix_redis/Cargo.toml
+++ b/actix_redis/Cargo.toml
@@ -7,7 +7,7 @@ workspace = ".."
 
 [dependencies]
 actix = "0.8.0-alpha.2"
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 actix-redis = { git="https://github.com/actix/actix-redis.git" }
 futures = "0.1.23"
 redis-async = "0.4.0"
diff --git a/actix_todo/Cargo.toml b/actix_todo/Cargo.toml
index 52551f0f..e1e09251 100644
--- a/actix_todo/Cargo.toml
+++ b/actix_todo/Cargo.toml
@@ -6,9 +6,9 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-alpha.2"
-actix-files = "0.1.0-alpha.1"
-actix-session = "0.1.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
+actix-files = "0.1.0-alpha.2"
+actix-session = "0.1.0-alpha.3"
 dotenv = "0.13.0"
 env_logger = "0.5.10"
 futures = "0.1.22"
diff --git a/async_db/Cargo.toml b/async_db/Cargo.toml
index 3ccfbc26..70e29622 100644
--- a/async_db/Cargo.toml
+++ b/async_db/Cargo.toml
@@ -7,7 +7,7 @@ workspace = ".."
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 
 dotenv = "0.10"
 env_logger = "0.5"
diff --git a/async_ex1/Cargo.toml b/async_ex1/Cargo.toml
index 62154f4b..69bcdc0d 100644
--- a/async_ex1/Cargo.toml
+++ b/async_ex1/Cargo.toml
@@ -7,7 +7,7 @@ workspace = ".."
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = { version="1.0.0-alpha.2", features=["ssl"] }
+actix-web = { version="1.0.0-alpha.3", features=["ssl"] }
 
 futures = "0.1"
 serde = "1.0.43"
diff --git a/basics/Cargo.toml b/basics/Cargo.toml
index 4c2dc1e6..93ad3606 100644
--- a/basics/Cargo.toml
+++ b/basics/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2018"
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = "1.0.0-alpha.2"
-actix-files = "0.1.0-alpha.1"
-actix-session = "0.1.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
+actix-files = "0.1.0-alpha.2"
+actix-session = "0.1.0-alpha.3"
 
 futures = "0.1.25"
 env_logger = "0.5"
diff --git a/cookie-auth/Cargo.toml b/cookie-auth/Cargo.toml
index f7cded59..ef75a84d 100644
--- a/cookie-auth/Cargo.toml
+++ b/cookie-auth/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2018"
 workspace = ".."
 
 [dependencies]
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 env_logger = "0.6"
diff --git a/cookie-session/Cargo.toml b/cookie-session/Cargo.toml
index 1655322f..466e2c67 100644
--- a/cookie-session/Cargo.toml
+++ b/cookie-session/Cargo.toml
@@ -6,8 +6,8 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-alpha.2"
-actix-session = "0.1.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
+actix-session = "0.1.0-alpha.3"
 
 futures = "0.1"
 time = "0.1"
diff --git a/diesel/Cargo.toml b/diesel/Cargo.toml
index 5da09f40..20643838 100644
--- a/diesel/Cargo.toml
+++ b/diesel/Cargo.toml
@@ -6,7 +6,7 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 
 bytes = "0.4"
 env_logger = "0.6"
diff --git a/error_handling/Cargo.toml b/error_handling/Cargo.toml
index 46f2f3e9..71e013a0 100644
--- a/error_handling/Cargo.toml
+++ b/error_handling/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 workspace = ".."
 
 [dependencies]
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 
 derive_more = "0.14.0"
 futures = "0.1.23"
diff --git a/form/Cargo.toml b/form/Cargo.toml
index 7e9eef60..f8386ad0 100644
--- a/form/Cargo.toml
+++ b/form/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 workspace = ".."
 
 [dependencies]
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 
 serde = "1.0"
 serde_derive = "1.0"
diff --git a/hello-world/Cargo.toml b/hello-world/Cargo.toml
index b3f23f99..879693a1 100644
--- a/hello-world/Cargo.toml
+++ b/hello-world/Cargo.toml
@@ -6,5 +6,5 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 env_logger = "0.6"
diff --git a/http-full-proxy/Cargo.toml b/http-full-proxy/Cargo.toml
index dfa5c50d..0030fad9 100644
--- a/http-full-proxy/Cargo.toml
+++ b/http-full-proxy/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 
 clap = "2.32.0"
 futures = "0.1.25"
diff --git a/http-full-proxy/src/main.rs b/http-full-proxy/src/main.rs
index f350769e..d6d91e50 100644
--- a/http-full-proxy/src/main.rs
+++ b/http-full-proxy/src/main.rs
@@ -16,7 +16,7 @@ fn forward(
     new_url.set_query(req.uri().query());
 
     let forwarded_req = client
-        .request_from(new_url.as_str(), &req)
+        .request_from(new_url.as_str(), req.head())
         .no_default_headers();
 
     // if let Some(addr) = req.peer_addr() {
diff --git a/http-proxy/Cargo.toml b/http-proxy/Cargo.toml
index 4bdeb424..cbca064c 100644
--- a/http-proxy/Cargo.toml
+++ b/http-proxy/Cargo.toml
@@ -15,7 +15,7 @@ path = "src/server.rs"
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 
 env_logger = "0.5"
 futures = "0.1"
diff --git a/http-proxy/src/main.rs b/http-proxy/src/main.rs
index 080c848d..e500bbee 100644
--- a/http-proxy/src/main.rs
+++ b/http-proxy/src/main.rs
@@ -8,7 +8,7 @@ fn index(client: web::Data<Client>) -> impl Future<Item = HttpResponse, Error =
         .get("http://127.0.0.1:8081/")
         .send()
         .map_err(Error::from) // <- convert SendRequestError to an Error
-        .and_then(|resp| {
+        .and_then(|mut resp| {
             resp.body() // <- this is MessageBody type, resolves to complete body
                 .from_err() // <- convert PayloadError to an Error
                 .and_then(|body| {
diff --git a/json/Cargo.toml b/json/Cargo.toml
index a742d2ab..3cd3d86a 100644
--- a/json/Cargo.toml
+++ b/json/Cargo.toml
@@ -6,7 +6,7 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 
 bytes = "0.4"
 futures = "0.1"
diff --git a/juniper/Cargo.toml b/juniper/Cargo.toml
index 14219124..e4161a03 100644
--- a/juniper/Cargo.toml
+++ b/juniper/Cargo.toml
@@ -6,7 +6,7 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 env_logger = "0.6"
 futures = "0.1"
 serde = "1.0"
diff --git a/middleware/Cargo.toml b/middleware/Cargo.toml
index 659dc317..33fe3a3c 100644
--- a/middleware/Cargo.toml
+++ b/middleware/Cargo.toml
@@ -7,6 +7,6 @@ workspace = ".."
 
 [dependencies]
 actix-service = "0.3.3"
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 futures = "0.1.25"
 env_logger = "0.6"
\ No newline at end of file
diff --git a/multipart/Cargo.toml b/multipart/Cargo.toml
index 758bfc29..1246fdd6 100644
--- a/multipart/Cargo.toml
+++ b/multipart/Cargo.toml
@@ -10,7 +10,7 @@ name = "multipart"
 path = "src/main.rs"
 
 [dependencies]
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 
 env_logger = "0.6"
 futures = "0.1.25"
diff --git a/multipart/src/main.rs b/multipart/src/main.rs
index 40f22d38..5ff785cb 100644
--- a/multipart/src/main.rs
+++ b/multipart/src/main.rs
@@ -19,6 +19,7 @@ pub fn save_file(field: web::MultipartField) -> impl Future<Item = i64, Error =
     Either::B(
         field
             .fold(0i64, move |acc, bytes| {
+                println!("CHUNK: {:?}", bytes.len());
                 file.write_all(bytes.as_ref())
                     .map(|_| acc + bytes.len() as i64)
                     .map_err(|e| {
diff --git a/protobuf/Cargo.toml b/protobuf/Cargo.toml
index 39e889f7..d71ec8ac 100644
--- a/protobuf/Cargo.toml
+++ b/protobuf/Cargo.toml
@@ -13,4 +13,4 @@ derive_more = "0.14"
 prost = "0.2.0"
 prost-derive = "0.2.0"
 
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
diff --git a/r2d2/Cargo.toml b/r2d2/Cargo.toml
index 1fbebaf6..a911f39f 100644
--- a/r2d2/Cargo.toml
+++ b/r2d2/Cargo.toml
@@ -7,7 +7,7 @@ workspace = ".."
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 
 futures = "0.1"
 env_logger = "0.6"
diff --git a/redis-session/Cargo.toml b/redis-session/Cargo.toml
index 33c4e09a..44b567c6 100644
--- a/redis-session/Cargo.toml
+++ b/redis-session/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 
 [dependencies]
 actix = "0.8.0-alpha.2"
-actix-web = "1.0.0-alpha.2"
-actix-session = "0.1.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
+actix-session = "0.1.0-alpha.3"
 actix-redis = { git = "https://github.com/actix/actix-redis.git", features = ["web"] }
 env_logger = "0.6"
diff --git a/rustls/Cargo.toml b/rustls/Cargo.toml
index 665ba2c4..a1f30259 100644
--- a/rustls/Cargo.toml
+++ b/rustls/Cargo.toml
@@ -12,5 +12,5 @@ path = "src/main.rs"
 [dependencies]
 env_logger = "0.5"
 rustls = "0.15"
-actix-web = { version = "1.0.0-alpha.2", features=["rust-tls"] }
-actix-files = "0.1.0-alpha.1"
+actix-web = { version = "1.0.0-alpha.3", features=["rust-tls"] }
+actix-files = "0.1.0-alpha.2"
diff --git a/simple-auth-server/Cargo.toml b/simple-auth-server/Cargo.toml
index 07a3c8d7..6bd3a666 100644
--- a/simple-auth-server/Cargo.toml
+++ b/simple-auth-server/Cargo.toml
@@ -8,8 +8,8 @@ workspace = ".."
 [dependencies]
 actix = { version = "0.8.0-alpha.2", features = ["http"] }
 actix-rt = "0.2.2"
-actix-web = "1.0.0-alpha.2"
-actix-files = "0.1.0-alpha.1"
+actix-web = "1.0.0-alpha.3"
+actix-files = "0.1.0-alpha.2"
 
 bcrypt = "0.2.1"
 chrono = { version = "0.4.6", features = ["serde"] }
diff --git a/state/Cargo.toml b/state/Cargo.toml
index 468fa9e7..f13f4f21 100644
--- a/state/Cargo.toml
+++ b/state/Cargo.toml
@@ -6,6 +6,6 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 futures = "0.1.25"
 env_logger = "0.6"
diff --git a/static_index/Cargo.toml b/static_index/Cargo.toml
index 7ead93ac..a7e8847f 100644
--- a/static_index/Cargo.toml
+++ b/static_index/Cargo.toml
@@ -9,5 +9,5 @@ edition = "2018"
 futures = "0.1"
 env_logger = "0.5"
 
-actix-web = "1.0.0-alpha.2"
-actix-files = "0.1.0-alpha.1"
+actix-web = "1.0.0-alpha.3"
+actix-files = "0.1.0-alpha.2"
diff --git a/template_askama/Cargo.toml b/template_askama/Cargo.toml
index d0667be5..6f53dfa4 100644
--- a/template_askama/Cargo.toml
+++ b/template_askama/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 
 [dependencies]
 #askama = { version = "0.8", features = ["with-actix-web"] }
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 env_logger = "0.6"
 askama = "0.8"
 
diff --git a/template_askama/build.rs b/template_askama/build.rs
deleted file mode 100644
index 89e3e6b1..00000000
--- a/template_askama/build.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-extern crate askama;
-
-fn main() {
-    askama::rerun_if_templates_changed();
-}
diff --git a/template_tera/Cargo.toml b/template_tera/Cargo.toml
index 560a9a74..bb4df6b6 100644
--- a/template_tera/Cargo.toml
+++ b/template_tera/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2018"
 [dependencies]
 env_logger = "0.6"
 tera = "0.11"
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
diff --git a/template_yarte/Cargo.toml b/template_yarte/Cargo.toml
index a734a375..9ef98b58 100644
--- a/template_yarte/Cargo.toml
+++ b/template_yarte/Cargo.toml
@@ -12,12 +12,12 @@ env_logger = "0.6"
 
 yarte = { version = "0.2", features=["with-actix-web"]  }
 
-actix-web = "1.0.0-alpha"
+actix-web = "1.0.0-alpha.3"
 
 [build-dependencies]
 yarte = { version = "0.2", features=["with-actix-web"]  }
 
 [dev-dependencies]
 bytes = "0.4"
-actix-http-test = "0.1.0-alpha"
-actix-http = "0.1.0-alpha"
+actix-http-test = "0.1.0-alpha.3"
+actix-http = "0.1.0-alpha.3"
diff --git a/tls/Cargo.toml b/tls/Cargo.toml
index 35dc8e68..c1ef14a8 100644
--- a/tls/Cargo.toml
+++ b/tls/Cargo.toml
@@ -11,6 +11,6 @@ path = "src/main.rs"
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = { version="1.0.0-alpha.2", features=["ssl"] }
+actix-web = { version="1.0.0-alpha.3", features=["ssl"] }
 env_logger = "0.6"
 openssl = { version="0.10" }
diff --git a/web-cors/backend/Cargo.toml b/web-cors/backend/Cargo.toml
index 59f7235f..f1794a52 100644
--- a/web-cors/backend/Cargo.toml
+++ b/web-cors/backend/Cargo.toml
@@ -6,7 +6,7 @@ workspace = "../../"
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-alpha.2"
+actix-web = "1.0.0-alpha.3"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
diff --git a/websocket-chat/Cargo.toml b/websocket-chat/Cargo.toml
index a3601cf6..34b389e6 100644
--- a/websocket-chat/Cargo.toml
+++ b/websocket-chat/Cargo.toml
@@ -11,9 +11,9 @@ path = "src/main.rs"
 
 [dependencies]
 actix = "0.8.0-alpha.2"
-actix-web = "1.0.0-alpha.2"
-actix-web-actors = "1.0.0-alpha.2"
-actix-files = "0.1.0-alpha.1"
+actix-web = "1.0.0-alpha.3"
+actix-web-actors = "1.0.0-alpha.3"
+actix-files = "0.1.0-alpha.2"
 
 rand = "0.6"
 bytes = "0.4"
diff --git a/websocket-tcp-chat/Cargo.toml b/websocket-tcp-chat/Cargo.toml
index ab1fff6c..40f25f51 100644
--- a/websocket-tcp-chat/Cargo.toml
+++ b/websocket-tcp-chat/Cargo.toml
@@ -15,9 +15,9 @@ path = "src/client.rs"
 
 [dependencies]
 actix = "0.8.0-alpha.2"
-actix-web = "1.0.0-alpha.2"
-actix-web-actors = "1.0.0-alpha.2"
-actix-files = "0.1.0-alpha.1"
+actix-web = "1.0.0-alpha.3"
+actix-web-actors = "1.0.0-alpha.3"
+actix-files = "0.1.0-alpha.2"
 
 rand = "0.6"
 bytes = "0.4"
diff --git a/websocket/Cargo.toml b/websocket/Cargo.toml
index 523eb74a..e3b9d153 100644
--- a/websocket/Cargo.toml
+++ b/websocket/Cargo.toml
@@ -15,9 +15,9 @@ path = "src/main.rs"
 
 [dependencies]
 actix = "0.8.0-alpha.2"
-actix-web = "1.0.0-alpha.2"
-actix-web-actors = "1.0.0-alpha.2"
-actix-files = "0.1.0-alpha.1"
+actix-web = "1.0.0-alpha.3"
+actix-web-actors = "1.0.0-alpha.3"
+actix-files = "0.1.0-alpha.2"
 env_logger = "0.6"
 futures = "0.1"
 bytes = "0.4"
\ No newline at end of file