From f45f4f22fc8edd6a8df75f35f074611e1103dd40 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 27 Sep 2019 08:12:43 -0700 Subject: [PATCH] Upgrade to rust 1.38 --- README.md | 2 +- ci/docker-rust/Dockerfile | 2 +- ci/rust-version.sh | 4 ++-- crate-features/README.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1db7e81be353dd..b04121adb98a64 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ $ source $HOME/.cargo/env $ rustup component add rustfmt ``` -If your rustc version is lower than 1.37.0, please update it: +If your rustc version is lower than 1.38.0, please update it: ```bash $ rustup update diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile index 97b503434acda9..6cf3f101b42eac 100644 --- a/ci/docker-rust/Dockerfile +++ b/ci/docker-rust/Dockerfile @@ -1,6 +1,6 @@ # Note: when the rust version is changed also modify # ci/rust-version.sh to pick up the new image tag -FROM rust:1.37.0 +FROM rust:1.38.0 # Add Google Protocol Buffers for Libra's metrics library. ENV PROTOC_VERSION 3.8.0 diff --git a/ci/rust-version.sh b/ci/rust-version.sh index d9da6c87346057..35e373774ee8c7 100644 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -13,8 +13,8 @@ # $ source ci/rust-version.sh # -stable_version=1.37.0 -nightly_version=2019-08-21 +stable_version=1.38.0 +nightly_version=2019-09-25 export rust_stable="$stable_version" export rust_stable_docker_image=solanalabs/rust:"$stable_version" diff --git a/crate-features/README.md b/crate-features/README.md index 4d5c1aec4305a3..20792663b05ae4 100644 --- a/crate-features/README.md +++ b/crate-features/README.md @@ -36,7 +36,7 @@ This information is not readily available from the stock `cargo` program, so use the following steps to produce a custom `cargo` program that will output the necessary feature information to stderr during a build: ```bash -$ git clone git@github.com:rust-lang/cargo.git -b rust-1.37.0 +$ git clone git@github.com:rust-lang/cargo.git -b rust-1.38.0 $ cd cargo $ git apply 0001-Print-package-features.patch $ cargo build