Adopt Rust edition 2021 (#1295)

Update to Rust 1.56.0 and adopt the 2021 edition (cherry picked from commit 23be602) Signed-off-by: Oliver Gould <[email protected]>
linkerd · Mar 30, 2022 · af26feb · af26feb
1 parent 27698fb
commit af26feb
Show file tree

Hide file tree

Showing 95 changed files with 79 additions and 89 deletions.
diff --git a/.github/actions/package/Dockerfile b/.github/actions/package/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=rust:1.55.0-buster
+ARG BASE_IMAGE=rust:1.56.0-buster
 FROM $BASE_IMAGE
 WORKDIR /linkerd
 RUN apt-get update && \

diff --git a/.github/workflows/advisory.yml b/.github/workflows/advisory.yml
@@ -24,7 +24,7 @@ jobs:
     timeout-minutes: 40
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.55.0-buster
+      image: docker://rust:1.56.0-buster
     permissions:
       contents: read
     strategy:

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     container:
-      image: docker://rust:1.55.0-buster
+      image: docker://rust:1.56.0-buster
       options: --security-opt seccomp=unconfined
     steps:
       - uses: actions/checkout@1e204e9a9253d643386038d443f96446fa156a97

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -24,7 +24,7 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.55.0-buster
+      image: docker://rust:1.56.0-buster
     permissions:
       contents: read
     steps:
@@ -37,7 +37,7 @@ jobs:
     timeout-minutes: 20
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.55.0-buster
+      image: docker://rust:1.56.0-buster
     permissions:
       contents: read
     steps:
@@ -49,7 +49,7 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.55.0-buster
+      image: docker://rust:1.56.0-buster
     permissions:
       contents: read
     steps:

diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,7 @@
 #     :; docker buildx build . --load
 
 # Please make changes via update-rust-version.sh
-ARG RUST_IMAGE=rust:1.55.0-buster
+ARG RUST_IMAGE=rust:1.56.0-buster
 
 # Use an arbitrary ~recent edge release image to get the proxy
 # identity-initializing and linkerd-await wrappers.
@@ -41,7 +41,7 @@ RUN --mount=type=cache,target=/var/lib/apt/lists \
 WORKDIR /usr/src/linkerd2-proxy
 COPY . .
 RUN --mount=type=cache,target=target \
-  --mount=type=cache,from=rust:1.55.0-buster,source=/usr/local/cargo,target=/usr/local/cargo \
+  --mount=type=cache,from=rust:1.56.0-buster,source=/usr/local/cargo,target=/usr/local/cargo \
   mkdir -p /out && \
   if [ -n "$PROXY_UNOPTIMIZED" ]; then \
   (cd linkerd2-proxy && /usr/bin/time -v cargo build --locked --features="$PROXY_FEATURES") && \

diff --git a/hyper-balance/Cargo.toml b/hyper-balance/Cargo.toml
@@ -3,7 +3,7 @@ name = "hyper-balance"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/addr/Cargo.toml b/linkerd/addr/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-addr"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/addr/fuzz/Cargo.toml b/linkerd/addr/fuzz/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-addr-fuzz"
 version = "0.0.0"
 authors = ["Linkerd Developers <[email protected]>"]
 publish = false
-edition = "2018"
+edition = "2021"
 
 [package.metadata]
 cargo-fuzz = true

diff --git a/linkerd/app/Cargo.toml b/linkerd/app/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-app"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 description = """
 Configures and executes the proxy

diff --git a/linkerd/app/admin/Cargo.toml b/linkerd/app/admin/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-app-admin"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 description = """
 The linkerd proxy's admin server.

diff --git a/linkerd/app/admin/src/server/mod.rs → linkerd/app/admin/src/server.rs b/linkerd/app/admin/src/server/mod.rs → linkerd/app/admin/src/server.rs
@@ -224,7 +224,7 @@ mod tests {
                     .unwrap();
                 let f = admin.clone().oneshot(r);
                 timeout(TIMEOUT, f).await.expect("timeout").expect("call")
-            };};
+            }};
         }
 
         assert_eq!(call!().status(), StatusCode::SERVICE_UNAVAILABLE);

diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-app-core"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 description = """
 Core infrastructure for the proxy application

diff --git a/linkerd/app/core/src/errors/mod.rs → linkerd/app/core/src/errors.rs b/linkerd/app/core/src/errors/mod.rs → linkerd/app/core/src/errors.rs
diff --git a/linkerd/app/core/src/metrics/mod.rs → linkerd/app/core/src/metrics.rs b/linkerd/app/core/src/metrics/mod.rs → linkerd/app/core/src/metrics.rs
diff --git a/linkerd/app/core/src/proxy/mod.rs → linkerd/app/core/src/proxy.rs b/linkerd/app/core/src/proxy/mod.rs → linkerd/app/core/src/proxy.rs
diff --git a/linkerd/app/core/src/telemetry/mod.rs → linkerd/app/core/src/telemetry.rs b/linkerd/app/core/src/telemetry/mod.rs → linkerd/app/core/src/telemetry.rs
diff --git a/linkerd/app/core/src/transport/mod.rs → linkerd/app/core/src/transport.rs b/linkerd/app/core/src/transport/mod.rs → linkerd/app/core/src/transport.rs
diff --git a/linkerd/app/gateway/Cargo.toml b/linkerd/app/gateway/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-app-gateway"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/app/gateway/src/lib.rs b/linkerd/app/gateway/src/lib.rs
@@ -26,10 +26,7 @@ use linkerd_app_inbound::{
     policy, Inbound,
 };
 use linkerd_app_outbound::{self as outbound, Outbound};
-use std::{
-    convert::{TryFrom, TryInto},
-    fmt,
-};
+use std::fmt;
 use thiserror::Error;
 use tracing::debug_span;
 

diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-app-inbound"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 description = """
 Configures and runs the inbound proxy

diff --git a/linkerd/app/inbound/fuzz/Cargo.toml b/linkerd/app/inbound/fuzz/Cargo.toml
@@ -4,7 +4,7 @@ name = "linkerd-app-inbound-fuzz"
 version = "0.0.0"
 authors = ["Automatically generated"]
 publish = false
-edition = "2018"
+edition = "2021"
 
 [package.metadata]
 cargo-fuzz = true

diff --git a/linkerd/app/inbound/src/http/mod.rs → linkerd/app/inbound/src/http.rs b/linkerd/app/inbound/src/http/mod.rs → linkerd/app/inbound/src/http.rs
diff --git a/linkerd/app/inbound/src/http/router.rs b/linkerd/app/inbound/src/http/router.rs
@@ -278,7 +278,7 @@ impl<A> svc::stack::RecognizeRoute<http::Request<A>> for LogicalPerRequest {
         use linkerd_app_core::{
             http_request_authority_addr, http_request_host_addr, CANONICAL_DST_HEADER,
         };
-        use std::{convert::TryInto, str::FromStr};
+        use std::str::FromStr;
 
         // Try to read a logical named address from the request. First check the canonical-dst
         // header as set by the client proxy; otherwise fallback to the request's `:authority` or

diff --git a/linkerd/app/inbound/src/metrics/mod.rs → linkerd/app/inbound/src/metrics.rs b/linkerd/app/inbound/src/metrics/mod.rs → linkerd/app/inbound/src/metrics.rs
diff --git a/linkerd/app/inbound/src/metrics/error/mod.rs → linkerd/app/inbound/src/metrics/error.rs b/linkerd/app/inbound/src/metrics/error/mod.rs → linkerd/app/inbound/src/metrics/error.rs
diff --git a/linkerd/app/inbound/src/policy/mod.rs → linkerd/app/inbound/src/policy.rs b/linkerd/app/inbound/src/policy/mod.rs → linkerd/app/inbound/src/policy.rs
diff --git a/...d/app/inbound/src/policy/authorize/mod.rs → linkerd/app/inbound/src/policy/authorize.rs b/...d/app/inbound/src/policy/authorize/mod.rs → linkerd/app/inbound/src/policy/authorize.rs
diff --git a/linkerd/app/inbound/src/policy/discover.rs b/linkerd/app/inbound/src/policy/discover.rs
@@ -12,7 +12,7 @@ use linkerd_server_policy::{
     Authentication, Authorization, Network, Protocol, ServerPolicy, Suffix,
 };
 use linkerd_tonic_watch::StreamWatch;
-use std::{convert::TryInto, net::IpAddr};
+use std::net::IpAddr;
 
 #[derive(Clone, Debug)]
 pub(super) struct Discover<S> {

diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-app-integration"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 description = """
 Proxy integration tests

diff --git a/linkerd/app/integration/src/tests/mod.rs → linkerd/app/integration/src/tests.rs b/linkerd/app/integration/src/tests/mod.rs → linkerd/app/integration/src/tests.rs
diff --git a/...pp/integration/src/tests/telemetry/mod.rs → ...rd/app/integration/src/tests/telemetry.rs b/...pp/integration/src/tests/telemetry/mod.rs → ...rd/app/integration/src/tests/telemetry.rs
diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-app-outbound"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 description = """
 Configures and runs the outbound proxy

diff --git a/linkerd/app/outbound/src/http/mod.rs → linkerd/app/outbound/src/http.rs b/linkerd/app/outbound/src/http/mod.rs → linkerd/app/outbound/src/http.rs
diff --git a/linkerd/app/outbound/src/metrics/mod.rs → linkerd/app/outbound/src/metrics.rs b/linkerd/app/outbound/src/metrics/mod.rs → linkerd/app/outbound/src/metrics.rs
diff --git a/...erd/app/outbound/src/metrics/error/mod.rs → linkerd/app/outbound/src/metrics/error.rs b/...erd/app/outbound/src/metrics/error/mod.rs → linkerd/app/outbound/src/metrics/error.rs
diff --git a/linkerd/app/outbound/src/tcp/mod.rs → linkerd/app/outbound/src/tcp.rs b/linkerd/app/outbound/src/tcp/mod.rs → linkerd/app/outbound/src/tcp.rs
diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-app-test"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 description = """
 Proxy integration tests

diff --git a/linkerd/cache/Cargo.toml b/linkerd/cache/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-cache"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/conditional/Cargo.toml b/linkerd/conditional/Cargo.toml
@@ -3,6 +3,6 @@ name = "linkerd-conditional"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
diff --git a/linkerd/detect/Cargo.toml b/linkerd/detect/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-detect"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/dns/Cargo.toml b/linkerd/dns/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-dns"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/dns/fuzz/Cargo.toml b/linkerd/dns/fuzz/Cargo.toml
@@ -4,7 +4,7 @@ name = "linkerd-dns-fuzz"
 version = "0.0.0"
 authors = ["Linkerd Developers <[email protected]>"]
 publish = false
-edition = "2018"
+edition = "2021"
 
 [package.metadata]
 cargo-fuzz = true

diff --git a/linkerd/dns/name/Cargo.toml b/linkerd/dns/name/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-dns-name"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/duplex/Cargo.toml b/linkerd/duplex/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-duplex"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/errno/Cargo.toml b/linkerd/errno/Cargo.toml
@@ -3,5 +3,5 @@ name = "linkerd-errno"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
diff --git a/linkerd/error-respond/Cargo.toml b/linkerd/error-respond/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-error-respond"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 

diff --git a/linkerd/error/Cargo.toml b/linkerd/error/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-error"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/exp-backoff/Cargo.toml b/linkerd/exp-backoff/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-exp-backoff"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 

diff --git a/linkerd/http-box/Cargo.toml b/linkerd/http-box/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-http-box"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/http-classify/Cargo.toml b/linkerd/http-classify/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-http-classify"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/http-metrics/Cargo.toml b/linkerd/http-metrics/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-http-metrics"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/http-metrics/src/requests/mod.rs → linkerd/http-metrics/src/requests.rs b/linkerd/http-metrics/src/requests/mod.rs → linkerd/http-metrics/src/requests.rs
diff --git a/linkerd/http-retry/Cargo.toml b/linkerd/http-retry/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-http-retry"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

diff --git a/linkerd/identity/Cargo.toml b/linkerd/identity/Cargo.toml
@@ -3,7 +3,8 @@ name = "linkerd-identity"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
+publish = false
 
 [features]
 default = []

diff --git a/linkerd/io/Cargo.toml b/linkerd/io/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-io"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 description = """
 General I/O primitives.

diff --git a/linkerd/metrics/Cargo.toml b/linkerd/metrics/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-metrics"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]

diff --git a/linkerd/metrics/src/latency.rs b/linkerd/metrics/src/latency.rs
@@ -44,7 +44,6 @@ pub struct Us(Duration);
 
 impl From<Us> for u64 {
     fn from(Us(us): Us) -> u64 {
-        use std::convert::TryInto;
         us.as_micros().try_into().unwrap_or_else(|_| {
             // These measurements should never be long enough to overflow
             tracing::warn!("Duration::as_micros would overflow u64");

diff --git a/linkerd/opencensus/Cargo.toml b/linkerd/opencensus/Cargo.toml
@@ -3,7 +3,7 @@ name = "linkerd-opencensus"
 version = "0.1.0"
 authors = ["Linkerd Developers <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]