Rename crates to reflect directory structure (#834)

This change renames most subcrates to be linkerd-* instead of
linkerd2-*, matching the repository layout.

The `linkerd2-proxy` and `linkerd2-proxy-api` crate names remain
unchanged, as they reflect their respective repository names.

Author: olix0r

Cargo.lock

@@ -11,8 +11,8 @@ futures = "0.3.9"
 http = "0.2"
 hyper = "0.14.2"
 pin-project = "1"
-tower = { version = "0.4.1", default-features = false, features = ["load"]}
-tokio = { version = "1", features = ["macros"]}
+tower = { version = "0.4.1", default-features = false, features = ["load"] }
+tokio = { version = "1", features = ["macros"] }
 
 [dev-dependencies]
 tokio-test = "0.4"

hyper-balance/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "linkerd2-addr"
+name = "linkerd-addr"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
@@ -8,4 +8,4 @@ publish = false
 
 [dependencies]
 http = "0.2"
-linkerd2-dns-name = { path = "../dns/name" }
+linkerd-dns-name = { path = "../dns/name" }

linkerd/addr/Cargo.toml

@@ -1,6 +1,6 @@
 #![deny(warnings, rust_2018_idioms)]
 
-use linkerd2_dns_name::Name;
+use linkerd_dns_name::Name;
 use std::{
     fmt,
     net::{IpAddr, SocketAddr},

linkerd/addr/src/lib.rs

@@ -1,5 +1,5 @@
 [package]
-name = "linkerd2-app"
+name = "linkerd-app"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
@@ -12,19 +12,19 @@ This is used by tests and the executable.
 """
 
 [features]
-mock-orig-dst  = ["linkerd2-app-core/mock-orig-dst"]
+mock-orig-dst  = ["linkerd-app-core/mock-orig-dst"]
 
 [dependencies]
 futures = "0.3.9"
 indexmap = "1.0"
 ipnet = "2.0"
-linkerd2-app-core = { path = "./core" }
-linkerd2-app-gateway = { path = "./gateway" }
-linkerd2-app-inbound = { path = "./inbound" }
-linkerd2-app-outbound = { path = "./outbound" }
-linkerd2-channel = { path = "../channel" }
-linkerd2-opencensus = { path = "../opencensus" }
-linkerd2-error = { path = "../error" }
+linkerd-app-core = { path = "./core" }
+linkerd-app-gateway = { path = "./gateway" }
+linkerd-app-inbound = { path = "./inbound" }
+linkerd-app-outbound = { path = "./outbound" }
+linkerd-channel = { path = "../channel" }
+linkerd-opencensus = { path = "../opencensus" }
+linkerd-error = { path = "../error" }
 regex = "1.0.0"
 tokio = { version = "1", features = ["rt"] }
 tonic = { version = "0.3", default-features = false, features = ["prost"] }

linkerd/app/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "linkerd2-app-core"
+name = "linkerd-app-core"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
@@ -13,54 +13,54 @@ independently of the inbound and outbound proxy logic.
 """
 
 [features]
-mock-orig-dst  = ["linkerd2-proxy-transport/mock-orig-dst"]
+mock-orig-dst  = ["linkerd-proxy-transport/mock-orig-dst"]
 
 [dependencies]
 bytes = "1"
 http = "0.2"
 http-body = "0.4"
 hyper = { version = "0.14.2", features = ["http1", "http2"] }
-futures = "0.3"
+futures = "0.3.9"
 indexmap = "1.0"
 ipnet = "2.0"
-linkerd2-addr = { path = "../../addr" }
-linkerd2-cache = { path = "../../cache" }
-linkerd2-buffer = { path = "../../buffer" }
-linkerd2-concurrency-limit = { path = "../../concurrency-limit" }
-linkerd2-conditional = { path = "../../conditional" }
-linkerd2-dns = { path = "../../dns" }
-linkerd2-drain = { path = "../../drain", features = ["retain"] }
-linkerd2-duplex = { path = "../../duplex" }
-linkerd2-errno = { path = "../../errno" }
-linkerd2-error = { path = "../../error" }
-linkerd2-error-metrics = { path = "../../error-metrics" }
-linkerd2-error-respond = { path = "../../error-respond" }
-linkerd2-exp-backoff = { path = "../../exp-backoff" }
-linkerd2-http-classify = { path = "../../http-classify" }
-linkerd2-http-metrics = { path = "../../http-metrics" }
-linkerd2-metrics = { path = "../../metrics" }
-linkerd2-transport-header = { path = "../../transport-header" }
-linkerd2-opencensus = { path = "../../opencensus" }
-linkerd2-proxy-core = { path = "../../proxy/core" }
+linkerd-addr = { path = "../../addr" }
+linkerd-cache = { path = "../../cache" }
+linkerd-buffer = { path = "../../buffer" }
+linkerd-concurrency-limit = { path = "../../concurrency-limit" }
+linkerd-conditional = { path = "../../conditional" }
+linkerd-dns = { path = "../../dns" }
+linkerd-drain = { path = "../../drain", features = ["retain"] }
+linkerd-duplex = { path = "../../duplex" }
+linkerd-errno = { path = "../../errno" }
+linkerd-error = { path = "../../error" }
+linkerd-error-metrics = { path = "../../error-metrics" }
+linkerd-error-respond = { path = "../../error-respond" }
+linkerd-exp-backoff = { path = "../../exp-backoff" }
+linkerd-http-classify = { path = "../../http-classify" }
+linkerd-http-metrics = { path = "../../http-metrics" }
+linkerd-metrics = { path = "../../metrics" }
+linkerd-transport-header = { path = "../../transport-header" }
+linkerd-opencensus = { path = "../../opencensus" }
+linkerd-proxy-core = { path = "../../proxy/core" }
 linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", branch = "ver/tonic-git" }
-linkerd2-proxy-api-resolve = { path = "../../proxy/api-resolve" }
-linkerd2-proxy-discover = { path = "../../proxy/discover" }
-linkerd2-proxy-identity = { path = "../../proxy/identity" }
-linkerd2-proxy-http = { path = "../../proxy/http" }
-linkerd2-proxy-resolve = { path = "../../proxy/resolve" }
-linkerd2-proxy-dns-resolve = { path = "../../proxy/dns-resolve" }
-linkerd2-proxy-tap = { path = "../../proxy/tap" }
-linkerd2-proxy-tcp = { path = "../../proxy/tcp" }
-linkerd2-proxy-transport = { path = "../../proxy/transport" }
-linkerd2-reconnect = { path = "../../reconnect" }
-linkerd2-retry = { path = "../../retry" }
-linkerd2-timeout = { path = "../../timeout" }
-linkerd2-tracing = { path = "../../tracing" }
-linkerd2-service-profiles = { path = "../../service-profiles" }
-linkerd2-stack = { path = "../../stack" }
-linkerd2-stack-metrics = { path = "../../stack/metrics" }
-linkerd2-stack-tracing = { path = "../../stack/tracing" }
-linkerd2-trace-context = { path = "../../trace-context" }
+linkerd-proxy-api-resolve = { path = "../../proxy/api-resolve" }
+linkerd-proxy-discover = { path = "../../proxy/discover" }
+linkerd-proxy-identity = { path = "../../proxy/identity" }
+linkerd-proxy-http = { path = "../../proxy/http" }
+linkerd-proxy-resolve = { path = "../../proxy/resolve" }
+linkerd-proxy-dns-resolve = { path = "../../proxy/dns-resolve" }
+linkerd-proxy-tap = { path = "../../proxy/tap" }
+linkerd-proxy-tcp = { path = "../../proxy/tcp" }
+linkerd-proxy-transport = { path = "../../proxy/transport" }
+linkerd-reconnect = { path = "../../reconnect" }
+linkerd-retry = { path = "../../retry" }
+linkerd-timeout = { path = "../../timeout" }
+linkerd-tracing = { path = "../../tracing" }
+linkerd-service-profiles = { path = "../../service-profiles" }
+linkerd-stack = { path = "../../stack" }
+linkerd-stack-metrics = { path = "../../stack/metrics" }
+linkerd-stack-tracing = { path = "../../stack/tracing" }
+linkerd-trace-context = { path = "../../trace-context" }
 regex = "1.0.0"
 tokio = { version = "1", features = ["macros", "sync", "parking_lot"]}
 tonic = { version = "0.3", default-features = false, features = ["prost"] }

linkerd/app/core/Cargo.toml

@@ -1,6 +1,6 @@
 use ipnet::IpNet;
-use linkerd2_addr::Addr;
-use linkerd2_dns::{Name, Suffix};
+use linkerd_addr::Addr;
+use linkerd_dns::{Name, Suffix};
 use std::{net::IpAddr, sync::Arc};
 
 #[derive(Clone, Debug, Default)]

linkerd/app/core/src/addr_match.rs

@@ -11,8 +11,8 @@ use crate::{
 use futures::future;
 use http::StatusCode;
 use hyper::{Body, Request, Response};
-use linkerd2_error::{Error, Never};
-use linkerd2_metrics::{self as metrics, FmtMetrics};
+use linkerd_error::{Error, Never};
+use linkerd_metrics::{self as metrics, FmtMetrics};
 use std::{
     future::Future,
     pin::Pin,

linkerd/app/core/src/admin/mod.rs

@@ -1,9 +1,9 @@
 use crate::profiles;
-use linkerd2_error::Error;
-use linkerd2_http_classify as classify;
-pub use linkerd2_http_classify::{CanClassify, NewClassify};
-use linkerd2_proxy_http::HasH2Reason;
-use linkerd2_timeout::error::ResponseTimeout;
+use linkerd_error::Error;
+use linkerd_http_classify as classify;
+pub use linkerd_http_classify::{CanClassify, NewClassify};
+use linkerd_proxy_http::HasH2Reason;
+use linkerd_timeout::error::ResponseTimeout;
 use std::borrow::Cow;
 use tonic as grpc;
 use tracing::trace;
@@ -226,7 +226,7 @@ impl Class {
 mod tests {
     use super::{Class, SuccessOrFailure};
     use http::{HeaderMap, Response, StatusCode};
-    use linkerd2_http_classify::{ClassifyEos, ClassifyResponse};
+    use linkerd_http_classify::{ClassifyEos, ClassifyResponse};
 
     #[test]
     fn http_response_status_ok() {

linkerd/app/core/src/classify.rs

@@ -36,9 +36,9 @@ impl fmt::Display for ControlAddr {
 type BalanceBody =
     http::balance::PendingUntilFirstDataBody<tower::load::peak_ewma::Handle, hyper::Body>;
 
-type RspBody = linkerd2_http_metrics::requests::ResponseBody<BalanceBody, classify::Eos>;
+type RspBody = linkerd_http_metrics::requests::ResponseBody<BalanceBody, classify::Eos>;
 
-pub type Client<B> = linkerd2_buffer::Buffer<http::Request<B>, http::Response<RspBody>>;
+pub type Client<B> = linkerd_buffer::Buffer<http::Request<B>, http::Response<RspBody>>;
 
 impl Config {
     pub fn build<B, I>(
@@ -75,7 +75,7 @@ impl Config {
 /// Sets the request's URI from `Config`.
 mod add_origin {
     use super::ControlAddr;
-    use linkerd2_stack::{layer, NewService};
+    use linkerd_stack::{layer, NewService};
     use std::task::{Context, Poll};
 
     pub fn layer<M>() -> impl layer::Layer<M, Service = NewAddOrigin<M>> + Clone {
@@ -141,7 +141,7 @@ mod resolve {
         },
         svc,
     };
-    use linkerd2_error::Recover;
+    use linkerd_error::Recover;
     use std::net::SocketAddr;
 
     pub fn layer<M, R>(
@@ -199,7 +199,7 @@ mod balance {
 mod client {
     use crate::transport::tls;
     use crate::{proxy::http, svc};
-    use linkerd2_proxy_http::h2::Settings as H2Settings;
+    use linkerd_proxy_http::h2::Settings as H2Settings;
     use std::{
         net::SocketAddr,
         task::{Context, Poll},