Update to Rust 1.38.0 (#377)

Includes formatting changes, as required by the new version of rustfmt.
linkerd · Oct 16, 2019 · f91035d · f91035d
1 parent 4866eb2
commit f91035d
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-1.37.0
+1.38.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -160,5 +160,4 @@ mod iface {
		}

		impl ::std::error::Error for NoCapacity {}

		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -721,7 +721,6 @@ mod http1 { @@
                 client: client::http1_absolute_uris
             }
         }
     }
     mod proxy_to_proxy {
@@ Expand Down @@