Skip to content

Commit f91035d

Browse files
authored
Update to Rust 1.38.0 (#377)
Includes formatting changes, as required by the new version of rustfmt.
1 parent 4866eb2 commit f91035d

File tree

7 files changed

+5
-8
lines changed

7 files changed

+5
-8
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
package:
1010
runs-on: ubuntu-latest
1111
container:
12-
image: docker://rust:1.37-buster
12+
image: docker://rust:1.38.0-buster
1313
steps:
1414
- name: git co
1515
uses: actions/checkout@v1

.github/workflows/rust.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fmt:
1111
runs-on: ubuntu-18.04
1212
container:
13-
image: docker://rust:1.37.0-buster
13+
image: docker://rust:1.38.0-buster
1414
steps:
1515
- uses: actions/checkout@v1
1616
- run: rustup component add rustfmt
@@ -19,7 +19,7 @@ jobs:
1919
lib:
2020
runs-on: ubuntu-18.04
2121
container:
22-
image: docker://rust:1.37.0-buster
22+
image: docker://rust:1.38.0-buster
2323
steps:
2424
- uses: actions/checkout@v1
2525
- run: make test-lib

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# runtime performance.
99

1010
# rather than updating this manually, run update-rust-version.sh
11-
ARG RUST_IMAGE=rust:1.37.0-buster
11+
ARG RUST_IMAGE=rust:1.38.0-buster
1212
ARG RUNTIME_IMAGE=gcr.io/linkerd-io/proxy:edge-19.10.2
1313
ARG PROXY_UNOPTIMIZED
1414

linkerd/app/core/src/tap/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,4 @@ mod iface {
160160
}
161161

162162
impl ::std::error::Error for NoCapacity {}
163-
164163
}

linkerd/app/integration/tests/discovery.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,6 @@ mod http1 {
721721
client: client::http1_absolute_uris
722722
}
723723
}
724-
725724
}
726725

727726
mod proxy_to_proxy {

linkerd/duplex/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,5 +258,4 @@ mod tests {
258258
assert_eq!(duplex.poll().unwrap(), Async::NotReady);
259259
assert_eq!(duplex.poll().unwrap(), Async::Ready(()));
260260
}
261-
262261
}

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.37.0
1+
1.38.0

0 commit comments

Comments
 (0)