From a2c9ff3a33830fc5d3d2f9b6a04cb7e4945ab7ab Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Thu, 28 Mar 2019 14:10:03 -0700
Subject: [PATCH] back to development

---
 Cargo.toml                      | 12 ++++++------
 actix-http/Cargo.toml           |  4 ++--
 actix-http/tests/test_server.rs |  4 ++--
 actix-web-codegen/Cargo.toml    |  2 +-
 awc/Cargo.toml                  |  8 ++++----
 test-server/Cargo.toml          |  6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f0bcabee0..25d950a98 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,11 +71,11 @@ actix-utils = "0.3.4"
 actix-router = "0.1.0"
 actix-rt = "0.2.2"
 actix-web-codegen = "0.1.0-alpha.1"
-actix-http = { version = "0.1.0-alpha.1", features=["fail"] }
+actix-http = { path = "actix-http", features=["fail"] }
 actix-server = "0.4.1"
 actix-server-config = "0.1.0"
 actix-threadpool = "0.1.0"
-awc = { version = "0.1.0-alpha.1", optional = true }
+awc = { path = "awc", optional = true }
 
 bytes = "0.4"
 derive_more = "0.14"
@@ -103,14 +103,14 @@ openssl = { version="0.10", optional = true }
 # rustls = { version = "^0.15", optional = true }
 
 [dev-dependencies]
-actix-http = { version = "0.1.0-alpha.1", features=["ssl", "brotli", "flate2-zlib"] }
-actix-http-test = { version = "0.1.0-alpha.1", features=["ssl"] }
+actix-http = { path = "actix-http", features=["ssl", "brotli", "flate2-zlib"] }
+actix-http-test = { path = "test-server", features=["ssl"] }
 rand = "0.6"
 env_logger = "0.6"
 serde_derive = "1.0"
 tokio-timer = "0.2.8"
-brotli2 = "^0.3.2"
-flate2 = "^1.0.2"
+brotli2 = "0.3.2"
+flate2 = "1.0.2"
 
 [profile.release]
 lto = true
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 07f712863..9734bd1a6 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -98,9 +98,9 @@ openssl = { version="0.10", optional = true }
 actix-rt = "0.2.2"
 actix-server = { version = "0.4.0", features=["ssl"] }
 actix-connect = { version = "0.1.0", features=["ssl"] }
-actix-http-test = { version = "0.1.0-alpha.1", features=["ssl"] }
+actix-http-test = { path = "../test-server", features=["ssl"] }
 
 env_logger = "0.6"
 serde_derive = "1.0"
 openssl = { version="0.10" }
-tokio-tcp = "0.1"
\ No newline at end of file
+tokio-tcp = "0.1"
diff --git a/actix-http/tests/test_server.rs b/actix-http/tests/test_server.rs
index 5777c5691..455edfec1 100644
--- a/actix-http/tests/test_server.rs
+++ b/actix-http/tests/test_server.rs
@@ -13,8 +13,8 @@ use futures::stream::{once, Stream};
 use actix_http::body::Body;
 use actix_http::error::PayloadError;
 use actix_http::{
-    body, error, http, http::header, Error, HttpMessage as HttpMessage2, HttpService,
-    KeepAlive, Request, Response,
+    body, error, http, http::header, Error, HttpMessage, HttpService, KeepAlive,
+    Request, Response,
 };
 
 fn load_body<S>(stream: S) -> impl Future<Item = BytesMut, Error = PayloadError>
diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml
index 8c9ce00c8..1f04cfd57 100644
--- a/actix-web-codegen/Cargo.toml
+++ b/actix-web-codegen/Cargo.toml
@@ -16,6 +16,6 @@ quote = "0.6"
 syn = { version = "0.15", features = ["full", "parsing"] }
 
 [dev-dependencies]
-actix-web = { path = ".." }
+actix-web = { version = "1.0.0-alpha.1" }
 actix-http = { version = "0.1.0-alpha.1", features=["ssl"] }
 actix-http-test = { version = "0.1.0-alpha.1", features=["ssl"] }
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index 65724dd77..de5142995 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -41,7 +41,7 @@ flate2-rust = ["actix-http/flate2-rust"]
 [dependencies]
 actix-codec = "0.1.1"
 actix-service = "0.3.4"
-actix-http = "0.1.0-alpha.1"
+actix-http = { path = "../actix-http" }
 base64 = "0.10.1"
 bytes = "0.4"
 derive_more = "0.14"
@@ -58,9 +58,9 @@ openssl = { version="0.10", optional = true }
 
 [dev-dependencies]
 actix-rt = "0.2.2"
-actix-web = { version = "1.0.0-alpha.1", features=["ssl"] }
-actix-http = { version = "0.1.0-alpha.1", features=["ssl"] }
-actix-http-test = { version = "0.1.0-alpha.1", features=["ssl"] }
+actix-web = { path = "..", features=["ssl"] }
+actix-http = { path = "../actix-http", features=["ssl"] }
+actix-http-test = { path = "../test-server", features=["ssl"] }
 actix-utils = "0.3.4"
 actix-server = { version = "0.4.0", features=["ssl"] }
 brotli2 = { version="0.3.2" }
diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml
index b6bbcf16b..582d96ed3 100644
--- a/test-server/Cargo.toml
+++ b/test-server/Cargo.toml
@@ -35,11 +35,11 @@ ssl = ["openssl", "actix-http/ssl", "actix-server/ssl", "awc/ssl"]
 [dependencies]
 actix-codec = "0.1.1"
 actix-rt = "0.2.1"
-actix-http = "0.1.0-alpha.1"
+actix-http = { path = "../actix-http" }
 actix-service = "0.3.4"
 actix-server = "0.4.0"
 actix-utils = "0.3.4"
-awc = "0.1.0-alpha.1"
+awc = { path = "../awc" }
 
 base64 = "0.10"
 bytes = "0.4"
@@ -61,4 +61,4 @@ tokio-timer = "0.2"
 openssl = { version="0.10", optional = true }
 
 [dev-dependencies]
-actix-web = "1.0.0-alpha.1"
+actix-web = { path = ".." }