From 526c0dfa164aa7b99a873384a2b9ba7a7137c201 Mon Sep 17 00:00:00 2001
From: Oliver Gould <ver@buoyant.io>
Date: Fri, 7 Jan 2022 15:40:42 -0800
Subject: [PATCH] Update Rust to v1.56.1 (#1431)

Some development tooling (like recent versions of cargo-deny) depends on
Rust v1.56.1. This change updates proxy build/CI to use this version for
consistency.
---
 .github/actions/package/Dockerfile |  2 +-
 .github/workflows/coverage.yml     |  2 +-
 .github/workflows/fast.yml         | 10 +++++-----
 .github/workflows/fuzzers.yml      |  2 +-
 .github/workflows/slow.yml         |  4 ++--
 Dockerfile                         |  4 ++--
 rust-toolchain                     |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/actions/package/Dockerfile b/.github/actions/package/Dockerfile
index d3d8d28f78..a24fb788b2 100644
--- a/.github/actions/package/Dockerfile
+++ b/.github/actions/package/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=rust:1.56.0-buster
+ARG BASE_IMAGE=rust:1.56.1-buster
 FROM $BASE_IMAGE
 WORKDIR /linkerd
 RUN apt-get update && \
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 8b68ab6c04..7dc2a766f5 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     container:
-      image: docker://rust:1.56.0-buster
+      image: docker://rust:1.56.1-buster
       options: --security-opt seccomp=unconfined # 🤷
     steps:
       - run: apt update && apt install -y cmake clang golang # for boring
diff --git a/.github/workflows/fast.yml b/.github/workflows/fast.yml
index 2cbbe33be6..1317dd5fbe 100644
--- a/.github/workflows/fast.yml
+++ b/.github/workflows/fast.yml
@@ -20,7 +20,7 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.0-buster
+      image: docker://rust:1.56.1-buster
     steps:
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
       - run: rustup component add clippy
@@ -31,7 +31,7 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.0-buster
+      image: docker://rust:1.56.1-buster
     steps:
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
       - run: rustup component add rustfmt
@@ -42,7 +42,7 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.0-buster
+      image: docker://rust:1.56.1-buster
     steps:
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
       - run: |
@@ -56,7 +56,7 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.0-buster
+      image: docker://rust:1.56.1-buster
     steps:
       - run: apt update && apt install -y cmake clang golang # for boring
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
@@ -90,7 +90,7 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.0-buster
+      image: docker://rust:1.56.1-buster
     steps:
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
       - run: |
diff --git a/.github/workflows/fuzzers.yml b/.github/workflows/fuzzers.yml
index f4acf8ac9b..f7f81fddf4 100644
--- a/.github/workflows/fuzzers.yml
+++ b/.github/workflows/fuzzers.yml
@@ -21,7 +21,7 @@ jobs:
     timeout-minutes: 40
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.0-buster
+      image: docker://rust:1.56.1-buster
     strategy:
       matrix:
         dir:
diff --git a/.github/workflows/slow.yml b/.github/workflows/slow.yml
index a91c8fd252..7ad21f9197 100644
--- a/.github/workflows/slow.yml
+++ b/.github/workflows/slow.yml
@@ -20,7 +20,7 @@ jobs:
     timeout-minutes: 20
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.0-buster
+      image: docker://rust:1.56.1-buster
     steps:
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
       - run: |
@@ -51,7 +51,7 @@ jobs:
     timeout-minutes: 20
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.56.0-buster
+      image: docker://rust:1.56.1-buster
     steps:
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
       - run: |
diff --git a/Dockerfile b/Dockerfile
index 7627d42797..5018a356c8 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.56.0-buster
+ARG RUST_IMAGE=rust:1.56.1-buster
 
 # Use an arbitrary ~recent edge release image to get the proxy
 # identity-initializing and linkerd-await wrappers.
@@ -47,7 +47,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.0-buster,source=/usr/local/cargo,target=/usr/local/cargo \
+    --mount=type=cache,from=rust:1.56.1-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/rust-toolchain b/rust-toolchain
index 3ebf789f5a..43c989b553 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.56.0
+1.56.1