Repace linkerd-drain with drain from crates.io (#1027)

The linkerd-drain crate has been split out into its on repo at
https://github.com/linkerd/drain-rs and published to crates.io. This
change removes the `linkerd/drain` directory and replaces dependencies
with `drain v0.0.1`.

Author: olix0r

Cargo.lock

@@ -171,6 +171,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "drain"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bace0faf279ba51822e2f4518eb311636d0e3198adbf7f55f496dc6ac96ac558"
+dependencies = [
+ "futures",
+ "tokio",
+ "tower",
+]
+
 [[package]]
 name = "dyn-clone"
 version = "1.0.4"
@@ -638,6 +649,7 @@ name = "linkerd-app-core"
 version = "0.1.0"
 dependencies = [
  "bytes",
+ "drain",
  "futures",
  "html-escape",
  "http",
@@ -651,7 +663,6 @@ dependencies = [
  "linkerd-conditional",
  "linkerd-detect",
  "linkerd-dns",
- "linkerd-drain",
  "linkerd-duplex",
  "linkerd-errno",
  "linkerd-error",
@@ -885,18 +896,6 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "linkerd-drain"
-version = "0.1.0"
-dependencies = [
- "futures",
- "linkerd-stack",
- "pin-project",
- "tokio",
- "tokio-test",
- "tower",
-]
-
 [[package]]
 name = "linkerd-duplex"
 version = "0.1.0"
@@ -1146,6 +1145,7 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "bytes",
+ "drain",
  "futures",
  "h2",
  "http",
@@ -1155,7 +1155,6 @@ dependencies = [
  "hyper-balance",
  "indexmap",
  "linkerd-detect",
- "linkerd-drain",
  "linkerd-duplex",
  "linkerd-error",
  "linkerd-http-box",

Cargo.toml

@@ -20,7 +20,6 @@ members = [
     "linkerd/transport-header",
     "linkerd/dns/name",
     "linkerd/dns",
-    "linkerd/drain",
     "linkerd/duplex",
     "linkerd/error",
     "linkerd/errno",

linkerd/app/core/Cargo.toml

@@ -14,6 +14,7 @@ independently of the inbound and outbound proxy logic.
 
 [dependencies]
 bytes = "1"
+drain = { version = "0.0.1", features = ["retain"] }
 http = "0.2"
 html-escape = "0.2"
 http-body = "0.4"
@@ -26,7 +27,6 @@ linkerd-cache = { path = "../../cache" }
 linkerd-concurrency-limit = { path = "../../concurrency-limit" }
 linkerd-conditional = { path = "../../conditional" }
 linkerd-dns = { path = "../../dns" }
-linkerd-drain = { path = "../../drain", features = ["retain"] }
 linkerd-detect = { path = "../../detect" }
 linkerd-duplex = { path = "../../duplex" }
 linkerd-errno = { path = "../../errno" }

linkerd/app/core/src/lib.rs

@@ -11,12 +11,12 @@
 #![forbid(unsafe_code)]
 #![allow(clippy::inconsistent_struct_constructor)]
 
+pub use drain;
 pub use linkerd_addr::{self as addr, Addr, NameAddr};
 pub use linkerd_cache as cache;
 pub use linkerd_conditional::Conditional;
 pub use linkerd_detect as detect;
 pub use linkerd_dns;
-pub use linkerd_drain as drain;
 pub use linkerd_error::{Error, Never, Recover};
 pub use linkerd_exp_backoff as exp_backoff;
 pub use linkerd_http_metrics as http_metrics;

linkerd/app/inbound/fuzz/Cargo.lock

@@ -158,6 +158,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "drain"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bace0faf279ba51822e2f4518eb311636d0e3198adbf7f55f496dc6ac96ac558"
+dependencies = [
+ "futures",
+ "tokio",
+ "tower",
+]
+
 [[package]]
 name = "dyn-clone"
 version = "1.0.4"
@@ -571,6 +582,7 @@ name = "linkerd-app-core"
 version = "0.1.0"
 dependencies = [
  "bytes",
+ "drain",
  "futures",
  "html-escape",
  "http",
@@ -584,7 +596,6 @@ dependencies = [
  "linkerd-conditional",
  "linkerd-detect",
  "linkerd-dns",
- "linkerd-drain",
  "linkerd-duplex",
  "linkerd-errno",
  "linkerd-error",
@@ -756,16 +767,6 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "linkerd-drain"
-version = "0.1.0"
-dependencies = [
- "futures",
- "linkerd-stack",
- "tokio",
- "tower",
-]
-
 [[package]]
 name = "linkerd-duplex"
 version = "0.1.0"
@@ -1006,6 +1007,7 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "bytes",
+ "drain",
  "futures",
  "h2",
  "http",
@@ -1015,7 +1017,6 @@ dependencies = [
  "hyper-balance",
  "indexmap",
  "linkerd-detect",
- "linkerd-drain",
  "linkerd-duplex",
  "linkerd-error",
  "linkerd-http-box",