Skip to content

Commit 49e8cb3

Browse files
committed
rust: use nightly-2020-03-25
This is to be able to use async/await syntax, which was merged a few days ago into nightly for no_std: rust-lang/rust#69033. This feature will be in beta in April and stable in June, at which point we can start to use those channels again. rust-toolchain file is added as a sanity check or for devs/users not using Docker.
1 parent d33f1d2 commit 49e8cb3

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.ci/travis-ci

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44
set -x
55

6-
CONTAINER=shiftcrypto/firmware_v2:13
6+
CONTAINER=shiftcrypto/firmware_v2:14
77

88
if [ "$1" == "pull" ] ; then
99
docker pull "$CONTAINER"

Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,11 @@ ENV PATH /opt/lcov-1.14/bin:$PATH
132132
# Install rust compiler
133133
ENV PATH /opt/cargo/bin:$PATH
134134
ENV RUSTUP_HOME=/opt/rustup
135-
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/opt/cargo sh -s -- --default-toolchain 1.42.0 -y
135+
# Also update ./rust-toolchain when changing the default toolchain.
136+
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/opt/cargo sh -s -- --default-toolchain nightly-2020-03-25 -y
136137
RUN rustup target add thumbv7em-none-eabi
137-
RUN rustup component add rustfmt
138+
# re-enable and put into CI once available: https://rust-lang.github.io/rustup-components-history/index.html
139+
# RUN rustup component add rustfmt
138140
RUN rustup component add clippy
139141
RUN CARGO_HOME=/opt/cargo cargo install cbindgen --version 0.13.1
140142
RUN CARGO_HOME=/opt/cargo cargo install bindgen --version 0.53.2

rust-toolchain

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nightly-2020-03-25

0 commit comments

Comments
 (0)