From 5265714f6867f8fcb893d18558fc6caaa1183923 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Thu, 21 Nov 2019 19:58:55 +0600
Subject: [PATCH] prep alpha.1 release

---
 actix-connect/Cargo.toml       | 4 ++--
 actix-server-config/Cargo.toml | 4 ++--
 actix-server/Cargo.toml        | 4 ++--
 actix-service/Cargo.toml       | 2 +-
 actix-service/src/lib.rs       | 2 --
 actix-threadpool/CHANGES.md    | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/actix-connect/Cargo.toml b/actix-connect/Cargo.toml
index 0198cd58..e5a9a38e 100644
--- a/actix-connect/Cargo.toml
+++ b/actix-connect/Cargo.toml
@@ -26,7 +26,7 @@ default = ["uri"]
 # openssl
 openssl = ["open-ssl", "tokio-openssl"]
 
-#rustls
+# rustls
 rustls = ["rust-tls", "tokio-rustls", "webpki"]
 
 # support http::Uri as connect address
@@ -50,7 +50,7 @@ trust-dns-resolver = { version="0.18.0-alpha.1", default-features = false }
 open-ssl = { version="0.10", package = "openssl", optional = true }
 tokio-openssl = { version = "0.4.0-alpha.6", optional = true }
 
-#rustls
+# rustls
 rust-tls = { version = "0.16.0", package = "rustls", optional = true }
 # tokio-rustls = { version = "0.10.0", optional = true }
 tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true }
diff --git a/actix-server-config/Cargo.toml b/actix-server-config/Cargo.toml
index 5f8589b8..29b8ad27 100644
--- a/actix-server-config/Cargo.toml
+++ b/actix-server-config/Cargo.toml
@@ -22,8 +22,8 @@ openssl = ["tokio-openssl"]
 rustls = ["tokio-rustls"]
 
 [dependencies]
-tokio-io = "0.2.0-alpha.6"
-tokio-net = "0.2.0-alpha.6"
+tokio-io = "=0.2.0-alpha.6"
+tokio-net = { version = "=0.2.0-alpha.6", features = ["tcp", "uds"] }
 tokio-openssl = { version = "0.4.0-alpha.6", optional = true }
 #tokio-rustls = { version = "0.12.0-alpha.8", optional = true }
 tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true }
diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml
index 118e7224..5683afb5 100644
--- a/actix-server/Cargo.toml
+++ b/actix-server/Cargo.toml
@@ -24,7 +24,7 @@ path = "src/lib.rs"
 default = []
 nativetls = ["native-tls", "tokio-tls"]
 openssl = ["open-ssl", "tokio-openssl", "actix-server-config/openssl"]
-rustls = ["rust-tls", "tokio-rustls", "webpki", "webpki-roots", "actix-server-config/rustls"]
+#rustls = ["rust-tls", "tokio-rustls", "webpki", "webpki-roots", "actix-server-config/rustls"]
 
 [dependencies]
 actix-rt = "1.0.0-alpha.1"
@@ -40,7 +40,7 @@ slab = "0.4"
 
 tokio = "0.2.0-alpha.6"
 tokio-io = "0.2.0-alpha.6"
-tokio-net = { version = "0.2.0-alpha.6", features = ["signal"] }
+tokio-net = { version = "0.2.0-alpha.6", features = ["signal", "tcp", "uds"] }
 tokio-timer = "0.3.0-alpha.6"
 
 # unix domain sockets
diff --git a/actix-service/Cargo.toml b/actix-service/Cargo.toml
index ad399205..1303cb8a 100644
--- a/actix-service/Cargo.toml
+++ b/actix-service/Cargo.toml
@@ -28,4 +28,4 @@ pin-project = "0.4.5"
 
 [dev-dependencies]
 tokio = "0.2.0-alpha.6"
-actix-rt = "0.2"
+# actix-rt = "1.0.0-alpha.1"
diff --git a/actix-service/src/lib.rs b/actix-service/src/lib.rs
index 1700e1c0..84410534 100644
--- a/actix-service/src/lib.rs
+++ b/actix-service/src/lib.rs
@@ -4,8 +4,6 @@ use std::rc::Rc;
 use std::sync::Arc;
 use std::task::{self, Context, Poll};
 
-use futures::future::{ready, Ready};
-
 mod and_then;
 mod apply;
 mod apply_cfg;
diff --git a/actix-threadpool/CHANGES.md b/actix-threadpool/CHANGES.md
index aadf9ac9..3ba82ee9 100644
--- a/actix-threadpool/CHANGES.md
+++ b/actix-threadpool/CHANGES.md
@@ -1,6 +1,6 @@
 # Changes
 
-## [0.2.0] - 2019-??-??
+## [0.2.0] - 2019-11-21
 
 ### Changed