diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index da73434315..5e87304a95 100644 --- 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 index 956babf731..98f8edf55a 100644 --- 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 index e08121b1e8..ddcc8218a6 100644 --- 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 index 9969c7cdc4..3e1baca7b7 100644 --- 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 index 7e39c186f8..27ac93d36c 100644 --- 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 index 7c729f1f3a..459dda8ab2 100644 --- 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 index a8473b0553..9dd5121dc4 100644 --- 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 index 70862a1c01..714f0333b7 100644 --- 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 index 452de50d4a..8140adb634 100644 --- 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 index d3749ee8da..14ead2e2ac 100644 --- 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 index 0ad52a786d..6955799aa2 100644 --- 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 index 94e98f299e..d1dda321c5 100644 --- 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 index e370b95113..76e972360d 100644 --- 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 index 0b65e6b7d2..2a14950cd7 100644 --- 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 index e8e76c5b32..793e5bbddd 100644 --- 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 index 6a03e98a41..63b1d4479d 100644 --- 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 index c7308782f3..507c118481 100644 --- 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 index e5a72324e6..9970c8cbac 100644 --- 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 index 38535ca7fe..7ca425981c 100644 --- 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::() .cloned() - .unwrap_or_else(|| tls::ConditionalServerTls::None(tls::NoServerTls::Disabled)) + .unwrap_or(tls::ConditionalServerTls::None(tls::NoServerTls::Disabled)) } fn dst_addr(&self, _: &http::Request) -> Option { diff --git a/linkerd/app/inbound/src/lib.rs b/linkerd/app/inbound/src/lib.rs index 5c7b4af982..0f0c6bb5e8 100644 --- 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 index f3b4f09c5a..339163746c 100644 --- 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 index 170d830ded..ada8a851b7 100644 --- 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), Done, diff --git a/linkerd/app/integration/src/lib.rs b/linkerd/app/integration/src/lib.rs index e98856e3fe..c55ddedb5c 100644 --- 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 index 97d09aeb73..3030e36a14 100644 --- 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 index 984bc7ace8..aae8f92179 100644 --- 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 index 29a6d7b0f0..c86420dff4 100644 --- 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 index 2df1230ed8..bfd9ab06c1 100644 --- 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 index 34eac2b919..b9b69f1d0a 100644 --- 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 index cdb22f69a8..59e7f0850f 100644 --- 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 index 7f015de7a0..952cf06cbf 100644 --- 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 index 5de3dc7ae0..07f8a4da3f 100644 --- 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 { 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::() { + if let Ok(ip) = utf8.replace('-', ".").parse::() { return Ok(net::SocketAddr::new(ip, srv.port())); } } diff --git a/linkerd/duplex/src/lib.rs b/linkerd/duplex/src/lib.rs index fec6c054b4..e76299cae8 100644 --- 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 { diff --git a/linkerd/errno/src/lib.rs b/linkerd/errno/src/lib.rs index 1b9c84cd75..9edc55fa86 100644 --- a/linkerd/errno/src/lib.rs +++ b/linkerd/errno/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/error-respond/src/lib.rs b/linkerd/error-respond/src/lib.rs index 7610c60f73..261fdab04c 100644 --- a/linkerd/error-respond/src/lib.rs +++ b/linkerd/error-respond/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/error/src/lib.rs b/linkerd/error/src/lib.rs index bc1672e585..d0d332870f 100644 --- a/linkerd/error/src/lib.rs +++ b/linkerd/error/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/exp-backoff/src/lib.rs b/linkerd/exp-backoff/src/lib.rs index 343c45c414..3b80b7ef56 100644 --- a/linkerd/exp-backoff/src/lib.rs +++ b/linkerd/exp-backoff/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/http-access-log/src/lib.rs b/linkerd/http-access-log/src/lib.rs index df9692ff06..fcb5ec270c 100644 --- a/linkerd/http-access-log/src/lib.rs +++ b/linkerd/http-access-log/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/http-box/src/lib.rs b/linkerd/http-box/src/lib.rs index 3e9a2b3af8..fb64239f6a 100644 --- a/linkerd/http-box/src/lib.rs +++ b/linkerd/http-box/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/http-classify/src/lib.rs b/linkerd/http-classify/src/lib.rs index 4c71d870d1..6a89453f3f 100644 --- a/linkerd/http-classify/src/lib.rs +++ b/linkerd/http-classify/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/http-metrics/src/lib.rs b/linkerd/http-metrics/src/lib.rs index f3c65b2f04..74c0aed9e6 100644 --- a/linkerd/http-metrics/src/lib.rs +++ b/linkerd/http-metrics/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/http-retry/src/lib.rs b/linkerd/http-retry/src/lib.rs index 6e0fdf21a2..e83b28a4d1 100644 --- a/linkerd/http-retry/src/lib.rs +++ b/linkerd/http-retry/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/identity/src/lib.rs b/linkerd/identity/src/lib.rs index b594545cfe..720c4ceaac 100644 --- a/linkerd/identity/src/lib.rs +++ b/linkerd/identity/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/io/src/lib.rs b/linkerd/io/src/lib.rs index fc06af1955..88098d8f6b 100644 --- a/linkerd/io/src/lib.rs +++ b/linkerd/io/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/meshtls/boring/src/lib.rs b/linkerd/meshtls/boring/src/lib.rs index ffa2078fab..c030051341 100644 --- a/linkerd/meshtls/boring/src/lib.rs +++ b/linkerd/meshtls/boring/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/meshtls/boring/src/server.rs b/linkerd/meshtls/boring/src/server.rs index 9d512471de..623daf849b 100644 --- a/linkerd/meshtls/boring/src/server.rs +++ b/linkerd/meshtls/boring/src/server.rs @@ -83,7 +83,7 @@ where debug!( tls = io.0.ssl().version_str(), - srv.cert = ?io.0.ssl().certificate().as_deref().and_then(super::fingerprint), + srv.cert = ?io.0.ssl().certificate().and_then(super::fingerprint), peer.cert = ?io.0.ssl().peer_certificate().as_deref().and_then(super::fingerprint), client.id = ?client_id, alpn = ?negotiated_protocol, diff --git a/linkerd/meshtls/rustls/src/lib.rs b/linkerd/meshtls/rustls/src/lib.rs index 0c4acff1a8..6fab2ba1c3 100644 --- a/linkerd/meshtls/rustls/src/lib.rs +++ b/linkerd/meshtls/rustls/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/meshtls/src/lib.rs b/linkerd/meshtls/src/lib.rs index 1e3892ae7a..6f1acc4733 100644 --- a/linkerd/meshtls/src/lib.rs +++ b/linkerd/meshtls/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/meshtls/tests/boring.rs b/linkerd/meshtls/tests/boring.rs index f2d5ec48b7..1bba7f180b 100644 --- a/linkerd/meshtls/tests/boring.rs +++ b/linkerd/meshtls/tests/boring.rs @@ -2,8 +2,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/meshtls/tests/rustls.rs b/linkerd/meshtls/tests/rustls.rs index 33c90b7a14..63456cc158 100644 --- a/linkerd/meshtls/tests/rustls.rs +++ b/linkerd/meshtls/tests/rustls.rs @@ -2,8 +2,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/meshtls/tests/util.rs b/linkerd/meshtls/tests/util.rs index d5e5e98a15..49c8bee0bd 100644 --- a/linkerd/meshtls/tests/util.rs +++ b/linkerd/meshtls/tests/util.rs @@ -1,4 +1,4 @@ -#![deny(warnings, clippy::disallowed_method, clippy::disallowed_type)] +#![deny(warnings, clippy::disallowed_methods, clippy::disallowed_types)] #![forbid(unsafe_code)] use futures::prelude::*; diff --git a/linkerd/metrics/src/lib.rs b/linkerd/metrics/src/lib.rs index d3bc17e947..b95a2c1366 100644 --- a/linkerd/metrics/src/lib.rs +++ b/linkerd/metrics/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/opencensus/src/lib.rs b/linkerd/opencensus/src/lib.rs index 541d6e5d79..9d7b9833fb 100644 --- a/linkerd/opencensus/src/lib.rs +++ b/linkerd/opencensus/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/proxy/api-resolve/src/lib.rs b/linkerd/proxy/api-resolve/src/lib.rs index cba17b3ac8..9326041f07 100644 --- a/linkerd/proxy/api-resolve/src/lib.rs +++ b/linkerd/proxy/api-resolve/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/proxy/core/src/lib.rs b/linkerd/proxy/core/src/lib.rs index 509e2e94e0..42767a35c9 100644 --- a/linkerd/proxy/core/src/lib.rs +++ b/linkerd/proxy/core/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/proxy/discover/src/lib.rs b/linkerd/proxy/discover/src/lib.rs index ad332deda5..bc836fadf9 100644 --- a/linkerd/proxy/discover/src/lib.rs +++ b/linkerd/proxy/discover/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/proxy/dns-resolve/src/lib.rs b/linkerd/proxy/dns-resolve/src/lib.rs index 55c8993846..759fd4f006 100644 --- a/linkerd/proxy/dns-resolve/src/lib.rs +++ b/linkerd/proxy/dns-resolve/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/proxy/http/src/lib.rs b/linkerd/proxy/http/src/lib.rs index d2f0db037c..af55aa9978 100644 --- a/linkerd/proxy/http/src/lib.rs +++ b/linkerd/proxy/http/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 http::header::AsHeaderName; diff --git a/linkerd/proxy/identity-client/src/lib.rs b/linkerd/proxy/identity-client/src/lib.rs index 500fa1b228..14938819d9 100644 --- a/linkerd/proxy/identity-client/src/lib.rs +++ b/linkerd/proxy/identity-client/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/proxy/resolve/src/lib.rs b/linkerd/proxy/resolve/src/lib.rs index 00075a35c9..7fcfe34f95 100644 --- a/linkerd/proxy/resolve/src/lib.rs +++ b/linkerd/proxy/resolve/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/proxy/tap/src/lib.rs b/linkerd/proxy/tap/src/lib.rs index d3986d4b59..0ba576f344 100644 --- a/linkerd/proxy/tap/src/lib.rs +++ b/linkerd/proxy/tap/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/proxy/tcp/src/lib.rs b/linkerd/proxy/tcp/src/lib.rs index 2a962c2da3..9db9c1d8a1 100644 --- a/linkerd/proxy/tcp/src/lib.rs +++ b/linkerd/proxy/tcp/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/proxy/transport/src/lib.rs b/linkerd/proxy/transport/src/lib.rs index 03c23571f2..2cf5325888 100644 --- a/linkerd/proxy/transport/src/lib.rs +++ b/linkerd/proxy/transport/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 )] diff --git a/linkerd/reconnect/src/lib.rs b/linkerd/reconnect/src/lib.rs index 2782c0eed3..e058bdc5ef 100644 --- a/linkerd/reconnect/src/lib.rs +++ b/linkerd/reconnect/src/lib.rs @@ -2,8 +2,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/retry/src/lib.rs b/linkerd/retry/src/lib.rs index 20d0bc04c8..45459c022b 100644 --- a/linkerd/retry/src/lib.rs +++ b/linkerd/retry/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/server-policy/src/lib.rs b/linkerd/server-policy/src/lib.rs index 1a66e80c37..601b57a55d 100644 --- a/linkerd/server-policy/src/lib.rs +++ b/linkerd/server-policy/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/service-profiles/src/lib.rs b/linkerd/service-profiles/src/lib.rs index beaff9ebb8..1da8a10bad 100644 --- a/linkerd/service-profiles/src/lib.rs +++ b/linkerd/service-profiles/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/signal/src/lib.rs b/linkerd/signal/src/lib.rs index 382057d2d9..e9b7d5f373 100644 --- a/linkerd/signal/src/lib.rs +++ b/linkerd/signal/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/stack/metrics/src/lib.rs b/linkerd/stack/metrics/src/lib.rs index 6fffdc9ad1..dd23abe342 100644 --- a/linkerd/stack/metrics/src/lib.rs +++ b/linkerd/stack/metrics/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/stack/src/lib.rs b/linkerd/stack/src/lib.rs index 175e4cbecb..46cc8799fc 100644 --- a/linkerd/stack/src/lib.rs +++ b/linkerd/stack/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/stack/tracing/src/lib.rs b/linkerd/stack/tracing/src/lib.rs index 7b29296c61..d45f95656e 100644 --- a/linkerd/stack/tracing/src/lib.rs +++ b/linkerd/stack/tracing/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/system/src/lib.rs b/linkerd/system/src/lib.rs index 085bf6de2a..1a3bf9f0e7 100644 --- a/linkerd/system/src/lib.rs +++ b/linkerd/system/src/lib.rs @@ -4,7 +4,7 @@ warnings, rust_2018_idioms, rust_2018_idioms, - clippy::disallowed_method, + clippy::disallowed_methods, unsafe_code )] diff --git a/linkerd/tls/src/lib.rs b/linkerd/tls/src/lib.rs index b61fae3dd5..72a99c1df5 100755 --- a/linkerd/tls/src/lib.rs +++ b/linkerd/tls/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/tls/test-util/src/lib.rs b/linkerd/tls/test-util/src/lib.rs index 64c91fd620..65476ad49e 100644 --- a/linkerd/tls/test-util/src/lib.rs +++ b/linkerd/tls/test-util/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/tonic-watch/src/lib.rs b/linkerd/tonic-watch/src/lib.rs index 65e242a840..cf24519dd7 100644 --- a/linkerd/tonic-watch/src/lib.rs +++ b/linkerd/tonic-watch/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/trace-context/src/lib.rs b/linkerd/trace-context/src/lib.rs index 14fa228a0f..1e49181813 100644 --- a/linkerd/trace-context/src/lib.rs +++ b/linkerd/trace-context/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/tracing/src/lib.rs b/linkerd/tracing/src/lib.rs index 3fdbac7c82..9f54d7d829 100644 --- a/linkerd/tracing/src/lib.rs +++ b/linkerd/tracing/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/transport-header/src/lib.rs b/linkerd/transport-header/src/lib.rs index d310829291..4fd79077f1 100644 --- a/linkerd/transport-header/src/lib.rs +++ b/linkerd/transport-header/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/transport-metrics/src/lib.rs b/linkerd/transport-metrics/src/lib.rs index 9cbe414a21..cdaffea0f7 100644 --- a/linkerd/transport-metrics/src/lib.rs +++ b/linkerd/transport-metrics/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/linkerd2-proxy/src/main.rs b/linkerd2-proxy/src/main.rs index 9474ee81d3..9363a0e7ed 100644 --- a/linkerd2-proxy/src/main.rs +++ b/linkerd2-proxy/src/main.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/opencensus-proto/src/lib.rs b/opencensus-proto/src/lib.rs index fcea3888de..fdf613c0d6 100644 --- a/opencensus-proto/src/lib.rs +++ b/opencensus-proto/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/rust-toolchain b/rust-toolchain index 43c989b553..bb120e876c 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.56.1 +1.59.0