diff --git a/.github/actions/package/Dockerfile b/.github/actions/package/Dockerfile index 71561dc13..196c3b187 100644 --- a/.github/actions/package/Dockerfile +++ b/.github/actions/package/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=rust:1.52.1-buster +ARG BASE_IMAGE=rust:1.53.0-buster FROM $BASE_IMAGE WORKDIR /linkerd RUN apt-get update && \ diff --git a/.github/workflows/advisory.yml b/.github/workflows/advisory.yml index 97451b95c..730ffe15a 100644 --- 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.52.1-buster + image: docker://rust:1.53.0-buster permissions: contents: read strategy: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 383e27c3c..2f1df7ad2 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 container: - image: docker://rust:1.52.1-buster + image: docker://rust:1.53.0-buster options: --security-opt seccomp=unconfined steps: - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 77b7e8e24..8799ee27d 100644 --- 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.52.1-buster + image: docker://rust:1.53.0-buster permissions: contents: read steps: @@ -37,7 +37,7 @@ jobs: timeout-minutes: 20 runs-on: ubuntu-latest container: - image: docker://rust:1.52.1-buster + image: docker://rust:1.53.0-buster permissions: contents: read steps: @@ -49,7 +49,7 @@ jobs: timeout-minutes: 5 runs-on: ubuntu-latest container: - image: docker://rust:1.52.1-buster + image: docker://rust:1.53.0-buster permissions: contents: read steps: diff --git a/Dockerfile b/Dockerfile index fe8bddde1..50b518205 100644 --- 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.52.1-buster +ARG RUST_IMAGE=rust:1.53.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.52.1-buster,source=/usr/local/cargo,target=/usr/local/cargo \ + --mount=type=cache,from=rust:1.53.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/linkerd/tls/src/lib.rs b/linkerd/tls/src/lib.rs index e76583168..5a512e437 100755 --- a/linkerd/tls/src/lib.rs +++ b/linkerd/tls/src/lib.rs @@ -39,7 +39,7 @@ impl std::fmt::Debug for NegotiatedProtocol { } impl NegotiatedProtocolRef<'_> { - pub fn to_owned(&self) -> NegotiatedProtocol { + pub fn to_owned(self) -> NegotiatedProtocol { NegotiatedProtocol(self.0.into()) } } diff --git a/rust-toolchain b/rust-toolchain index 154cb93b2..3f4830156 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.52.1 +1.53.0