Update Rust to v1.59.0

Signed-off-by: Oliver Gould <ver@buoyant.io>
linkerd · Feb 25, 2022 · a14c642 · a14c642
1 parent e4cb6ec
commit a14c642
Show file tree

Hide file tree

Showing 81 changed files with 152 additions and 150 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUST_VERSION=1.56.1
+ARG RUST_VERSION=1.59.0
 
 FROM docker.io/rust:${RUST_VERSION}-bullseye as kubectl
 ARG KUBECTL_VERSION=v1.23.2

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
 	"name": "linkerd2-proxy",
-	"image": "ghcr.io/linkerd/dev-proxy:v7",
+	"image": "ghcr.io/linkerd/dev-proxy:v8",
 	// "dockerFile": "./Dockerfile",
 	"extensions": [
 		"matklad.rust-analyzer",

diff --git a/.github/actions/package/Dockerfile b/.github/actions/package/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUST_VERSION=1.56.1
+ARG RUST_VERSION=1.59.0
 ARG BASE_IMAGE=rust:${RUST_VERSION}-buster
 FROM $BASE_IMAGE
 WORKDIR /linkerd

diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -23,7 +23,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     timeout-minutes: 20
     continue-on-error: true
     steps:

diff --git a/.github/workflows/check-all.yml b/.github/workflows/check-all.yml
@@ -26,7 +26,7 @@ jobs:
     timeout-minutes: 20
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     steps:
       - run: |
           curl --proto =https --tlsv1.3 -vsSfLo /usr/local/bin/cargo-action-fmt "https://github.com/olix0r/cargo-action-fmt/releases/download/release%2F${CARGO_ACTION_FMT_VERSION}/cargo-action-fmt-x86_64-unknown-linux-gnu"

diff --git a/.github/workflows/check-each.yml b/.github/workflows/check-each.yml
@@ -27,7 +27,7 @@ jobs:
     timeout-minutes: 3
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     steps:
       - run: apt update && apt install -y jq
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
@@ -82,7 +82,7 @@ jobs:
     timeout-minutes: 20
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     strategy:
       matrix:
         crate: ${{ fromJson(needs.list-changed-crates.outputs.crates) }}

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
       options: --security-opt seccomp=unconfined # 🤷
     steps:
       - run: apt update && apt install -y cmake clang golang # for boring

diff --git a/.github/workflows/fuzzers.yml b/.github/workflows/fuzzers.yml
@@ -26,7 +26,7 @@ jobs:
     timeout-minutes: 3
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     steps:
       - run: apt update && apt install -y jo
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
@@ -79,7 +79,7 @@ jobs:
     timeout-minutes: 40
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     strategy:
       matrix:
         dir: ${{ fromJson(needs.list-changed.outputs.dirs) }}

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -26,7 +26,7 @@ jobs:
     timeout-minutes: 20
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     steps:
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
       - run: |

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -22,7 +22,7 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     steps:
       - run: |
           curl --proto =https --tlsv1.3 -vsSfLo /usr/local/bin/cargo-action-fmt "https://github.com/olix0r/cargo-action-fmt/releases/download/release%2F${CARGO_ACTION_FMT_VERSION}/cargo-action-fmt-x86_64-unknown-linux-gnu"
@@ -36,7 +36,7 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     steps:
       - run: rustup component add rustfmt
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
@@ -46,7 +46,7 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     steps:
       - run: |
           curl --proto =https --tlsv1.3 -vsSfLo /usr/local/bin/cargo-action-fmt "https://github.com/olix0r/cargo-action-fmt/releases/download/release%2F${CARGO_ACTION_FMT_VERSION}/cargo-action-fmt-x86_64-unknown-linux-gnu"

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -23,7 +23,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     timeout-minutes: 20
     continue-on-error: true
     steps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     steps:
       - run: apt update && apt install -y cmake clang golang # for boring
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
@@ -59,7 +59,7 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.1-buster
+      image: docker://rust:1.59.0-buster
     steps:
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
       - run: |

diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,7 @@
 #     :; docker buildx build . --load
 
 # Please make changes via update-rust-version.sh
-ARG RUST_VERSION=1.56.1
+ARG RUST_VERSION=1.59.0
 ARG RUST_IMAGE=rust:${RUST_VERSION}-buster
 
 # Use an arbitrary ~recent edge release image to get the proxy
@@ -48,7 +48,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.56.1-buster,source=/usr/local/cargo,target=/usr/local/cargo \
+    --mount=type=cache,from=rust:1.59.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 --no-default-features --features="$PROXY_FEATURES") && \

diff --git a/hyper-balance/src/lib.rs b/hyper-balance/src/lib.rs
@@ -1,8 +1,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/addr/src/lib.rs b/linkerd/addr/src/lib.rs
@@ -1,8 +1,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 use linkerd_dns_name::Name;

diff --git a/linkerd/app/admin/src/lib.rs b/linkerd/app/admin/src/lib.rs
@@ -1,8 +1,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/app/core/src/lib.rs b/linkerd/app/core/src/lib.rs
@@ -10,8 +10,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/app/gateway/src/lib.rs b/linkerd/app/gateway/src/lib.rs
@@ -1,8 +1,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/app/inbound/src/http/router.rs b/linkerd/app/inbound/src/http/router.rs
@@ -395,7 +395,7 @@ impl tap::Inspect for Logical {
         req.extensions()
             .get::<tls::ConditionalServerTls>()
             .cloned()
-            .unwrap_or_else(|| tls::ConditionalServerTls::None(tls::NoServerTls::Disabled))
+            .unwrap_or(tls::ConditionalServerTls::None(tls::NoServerTls::Disabled))
     }
 
     fn dst_addr<B>(&self, _: &http::Request<B>) -> Option<SocketAddr> {

diff --git a/linkerd/app/inbound/src/lib.rs b/linkerd/app/inbound/src/lib.rs
@@ -6,8 +6,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/app/inbound/src/policy/config.rs b/linkerd/app/inbound/src/policy/config.rs
@@ -7,6 +7,7 @@ use std::collections::{HashMap, HashSet};
 /// The proxy usually watches dynamic policies from the control plane, though it can also use
 /// 'fixed' policies configured at startup.
 #[derive(Clone, Debug)]
+#[allow(clippy::large_enum_variant)]
 pub enum Config {
     Discover {
         control: control::Config,

diff --git a/linkerd/app/integration/src/controller.rs b/linkerd/app/integration/src/controller.rs
@@ -57,6 +57,7 @@ pub struct RouteBuilder {
 }
 
 #[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
 enum Dst {
     Call(pb::GetDestination, Result<DstReceiver, grpc::Status>),
     Done,

diff --git a/linkerd/app/integration/src/lib.rs b/linkerd/app/integration/src/lib.rs
@@ -3,8 +3,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/app/outbound/src/lib.rs b/linkerd/app/outbound/src/lib.rs
@@ -5,8 +5,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/app/src/lib.rs b/linkerd/app/src/lib.rs
@@ -3,8 +3,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/app/test/src/lib.rs b/linkerd/app/test/src/lib.rs
@@ -3,8 +3,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/cache/src/lib.rs b/linkerd/cache/src/lib.rs
@@ -1,8 +1,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/conditional/src/lib.rs b/linkerd/conditional/src/lib.rs
@@ -1,8 +1,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/detect/src/lib.rs b/linkerd/detect/src/lib.rs
@@ -1,8 +1,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/dns/name/src/lib.rs b/linkerd/dns/name/src/lib.rs
@@ -1,8 +1,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 

diff --git a/linkerd/dns/src/lib.rs b/linkerd/dns/src/lib.rs
@@ -1,8 +1,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type
+    clippy::disallowed_methods,
+    clippy::disallowed_types
 )]
 #![forbid(unsafe_code)]
 
@@ -120,7 +120,7 @@ impl Resolver {
     fn srv_to_socket_addr(srv: rdata::SRV) -> Result<net::SocketAddr, InvalidSrv> {
         if let Some(first_label) = srv.target().iter().next() {
             if let Ok(utf8) = std::str::from_utf8(first_label) {
-                if let Ok(ip) = utf8.replace("-", ".").parse::<std::net::IpAddr>() {
+                if let Ok(ip) = utf8.replace('-', ".").parse::<std::net::IpAddr>() {
                     return Ok(net::SocketAddr::new(ip, srv.port()));
                 }
             }

diff --git a/linkerd/duplex/src/lib.rs b/linkerd/duplex/src/lib.rs
@@ -5,8 +5,8 @@
 #![deny(
     warnings,
     rust_2018_idioms,
-    clippy::disallowed_method,
-    clippy::disallowed_type,
+    clippy::disallowed_methods,
+    clippy::disallowed_types,
     unsafe_code
 )]
 
@@ -82,13 +82,13 @@ where
     type Output = io::Result<()>;
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> io::Poll<()> {
-        let mut this = self.project();
+        let this = self.project();
         // This purposefully ignores the Async part, since we don't want to
         // return early if the first half isn't ready, but the other half
         // could make progress.
         trace!("poll");
-        let _ = this.half_in.copy_into(&mut this.half_out, cx)?;
-        let _ = this.half_out.copy_into(&mut this.half_in, cx)?;
+        let _ = this.half_in.copy_into(this.half_out, cx)?;
+        let _ = this.half_out.copy_into(this.half_in, cx)?;
         if this.half_in.is_done() && this.half_out.is_done() {
             Poll::Ready(Ok(()))
         } else {