From c1c44a7dd69137d99fb05b6aca370eb26fb7ebe0 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Mon, 25 Nov 2019 17:59:14 +0600
Subject: [PATCH] upgrade derive_more

---
 CHANGES.md                   | 4 +++-
 Cargo.toml                   | 4 +++-
 actix-cors/Cargo.toml        | 2 +-
 actix-files/Cargo.toml       | 2 +-
 actix-http/Cargo.toml        | 2 +-
 actix-multipart/Cargo.toml   | 2 +-
 actix-session/Cargo.toml     | 2 +-
 actix-web-codegen/Cargo.toml | 6 +++---
 awc/Cargo.toml               | 2 +-
 9 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3d4b2d78a..a7569862d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,11 @@
 # Changes
 
-## [2.0.0-alpha.2] - 2019-xx-xx
+## [2.0.0-alpha.1] - 2019-11-22
 
 ### Changed
 
+* Migrated to `std::future`
+
 * Remove implementation of `Responder` for `()`. (#1167)
 
 
diff --git a/Cargo.toml b/Cargo.toml
index 7524bff73..dda01b481 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,7 +83,7 @@ actix-threadpool = "0.2.0-alpha.1"
 awc = { version = "0.3.0-alpha.1", optional = true }
 
 bytes = "0.4"
-derive_more = "0.15.0"
+derive_more = "0.99.2"
 encoding_rs = "0.8"
 futures = "0.3.1"
 hashbrown = "0.6.3"
@@ -125,6 +125,8 @@ actix-http = { path = "actix-http" }
 actix-http-test = { path = "test-server" }
 actix-web-codegen = { path = "actix-web-codegen" }
 # actix-web-actors = { path = "actix-web-actors" }
+actix-cors = { path = "actix-cors" }
+actix-identity = { path = "actix-identity" }
 actix-session = { path = "actix-session" }
 actix-files = { path = "actix-files" }
 actix-multipart = { path = "actix-multipart" }
diff --git a/actix-cors/Cargo.toml b/actix-cors/Cargo.toml
index 57aa5833a..11ad10334 100644
--- a/actix-cors/Cargo.toml
+++ b/actix-cors/Cargo.toml
@@ -19,5 +19,5 @@ path = "src/lib.rs"
 [dependencies]
 actix-web = "2.0.0-alpha.1"
 actix-service = "1.0.0-alpha.1"
-derive_more = "0.15.0"
+derive_more = "0.99.2"
 futures = "0.3.1"
diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml
index 6e33bb412..f5318b72e 100644
--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@@ -24,7 +24,7 @@ actix-service = "1.0.0-alpha.1"
 bitflags = "1"
 bytes = "0.4"
 futures = "0.3.1"
-derive_more = "0.15.0"
+derive_more = "0.99.2"
 log = "0.4"
 mime = "0.3"
 mime_guess = "2.0.1"
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 5bffa0ac3..cf390e796 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -59,7 +59,7 @@ bitflags = "1.0"
 bytes = "0.4"
 copyless = "0.1.4"
 chrono = "0.4.6"
-derive_more = "0.15.0"
+derive_more = "0.99.2"
 either = "1.5.2"
 encoding_rs = "0.8"
 futures = "0.3.1"
diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml
index f5cdc8afd..52b33d582 100644
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@@ -22,7 +22,7 @@ actix-web = { version = "2.0.0-alpha.1", default-features = false }
 actix-service = "1.0.0-alpha.1"
 actix-utils = "0.5.0-alpha.1"
 bytes = "0.4"
-derive_more = "0.15.0"
+derive_more = "0.99.2"
 httparse = "1.3"
 futures = "0.3.1"
 log = "0.4"
diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml
index 3ce2a8b40..a4c53e563 100644
--- a/actix-session/Cargo.toml
+++ b/actix-session/Cargo.toml
@@ -27,7 +27,7 @@ cookie-session = ["actix-web/secure-cookies"]
 actix-web = "2.0.0-alpha.1"
 actix-service = "1.0.0-alpha.1"
 bytes = "0.4"
-derive_more = "0.15.0"
+derive_more = "0.99.2"
 futures = "0.3.1"
 hashbrown = "0.6.3"
 serde = "1.0"
diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml
index 5336f60b9..0aa81e476 100644
--- a/actix-web-codegen/Cargo.toml
+++ b/actix-web-codegen/Cargo.toml
@@ -12,9 +12,9 @@ workspace = ".."
 proc-macro = true
 
 [dependencies]
-quote = "1"
-syn = { version = "1", features = ["full", "parsing"] }
-proc-macro2 = "1"
+quote = "^1"
+syn = { version = "^1", features = ["full", "parsing"] }
+proc-macro2 = "^1"
 
 [dev-dependencies]
 actix-web = { version = "2.0.0-alpha.1" }
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index eed7eabe7..0f338b404 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -48,7 +48,7 @@ actix-http = "0.3.0-alpha.1"
 
 base64 = "0.10.1"
 bytes = "0.4"
-derive_more = "0.15.0"
+derive_more = "0.99.2"
 futures = "0.3.1"
 log =" 0.4"
 mime = "0.3"