From f91035de82b352f2ce0469c4fcceeb16184621c1 Mon Sep 17 00:00:00 2001
From: Oliver Gould <ver@buoyant.io>
Date: Wed, 16 Oct 2019 16:23:40 -0700
Subject: [PATCH] Update to Rust 1.38.0 (#377)

Includes formatting changes, as required by the new version of rustfmt.
---
 .github/workflows/release.yml              | 2 +-
 .github/workflows/rust.yml                 | 4 ++--
 Dockerfile                                 | 2 +-
 linkerd/app/core/src/tap/mod.rs            | 1 -
 linkerd/app/integration/tests/discovery.rs | 1 -
 linkerd/duplex/src/lib.rs                  | 1 -
 rust-toolchain                             | 2 +-
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ebf7c679c..615b8033d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
   package:
     runs-on: ubuntu-latest
     container:
-      image: docker://rust:1.37-buster
+      image: docker://rust:1.38.0-buster
     steps:
     - name: git co
       uses: actions/checkout@v1
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index a707bb85b..94ed5c1ec 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -10,7 +10,7 @@ jobs:
   fmt:
     runs-on: ubuntu-18.04
     container:
-      image: docker://rust:1.37.0-buster
+      image: docker://rust:1.38.0-buster
     steps:
     - uses: actions/checkout@v1
     - run: rustup component add rustfmt
@@ -19,7 +19,7 @@ jobs:
   lib:
     runs-on: ubuntu-18.04
     container:
-      image: docker://rust:1.37.0-buster
+      image: docker://rust:1.38.0-buster
     steps:
     - uses: actions/checkout@v1
     - run: make test-lib
diff --git a/Dockerfile b/Dockerfile
index 5bd364c4a..de09b63a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@
 # runtime performance.
 
 # rather than updating this manually, run update-rust-version.sh
-ARG RUST_IMAGE=rust:1.37.0-buster
+ARG RUST_IMAGE=rust:1.38.0-buster
 ARG RUNTIME_IMAGE=gcr.io/linkerd-io/proxy:edge-19.10.2
 ARG PROXY_UNOPTIMIZED
 
diff --git a/linkerd/app/core/src/tap/mod.rs b/linkerd/app/core/src/tap/mod.rs
index c81e85927..4a9b20ca9 100644
--- a/linkerd/app/core/src/tap/mod.rs
+++ b/linkerd/app/core/src/tap/mod.rs
@@ -160,5 +160,4 @@ mod iface {
     }
 
     impl ::std::error::Error for NoCapacity {}
-
 }
diff --git a/linkerd/app/integration/tests/discovery.rs b/linkerd/app/integration/tests/discovery.rs
index db622cd9b..f18590662 100644
--- a/linkerd/app/integration/tests/discovery.rs
+++ b/linkerd/app/integration/tests/discovery.rs
@@ -721,7 +721,6 @@ mod http1 {
             client: client::http1_absolute_uris
         }
     }
-
 }
 
 mod proxy_to_proxy {
diff --git a/linkerd/duplex/src/lib.rs b/linkerd/duplex/src/lib.rs
index cdd59130f..d7ce52e0d 100644
--- a/linkerd/duplex/src/lib.rs
+++ b/linkerd/duplex/src/lib.rs
@@ -258,5 +258,4 @@ mod tests {
         assert_eq!(duplex.poll().unwrap(), Async::NotReady);
         assert_eq!(duplex.poll().unwrap(), Async::Ready(()));
     }
-
 }
diff --git a/rust-toolchain b/rust-toolchain
index bf50e910e..ebeef2f2d 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.37.0
+1.38.0