From d04c41c4f1200d8bd3dbdbbd5d91e4dea6273000 Mon Sep 17 00:00:00 2001 From: Nick Hynes Date: Sun, 24 Mar 2019 10:42:59 -0700 Subject: [PATCH] Use version invariant rustfmt (#2886) --- docker/install/ubuntu_install_rust.sh | 8 +++----- rust/.rustfmt.toml | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docker/install/ubuntu_install_rust.sh b/docker/install/ubuntu_install_rust.sh index e41a3d63a1be..f27ba7226179 100755 --- a/docker/install/ubuntu_install_rust.sh +++ b/docker/install/ubuntu_install_rust.sh @@ -9,12 +9,10 @@ apt-get update && apt-get install -y --no-install-recommends curl export RUSTUP_HOME=/opt/rust export CARGO_HOME=/opt/rust # this rustc is one supported by the installed version of rust-sgx-sdk -curl -s -S -L https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain nightly-2019-01-28 +curl -s -S -L https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain nightly-2019-03-24 . $CARGO_HOME/env -rustup component add rust-src -cargo install sccache -cargo install rustfmt-nightly --version 1.0.1 --force -cargo install xargo +rustup component add rustfmt +cargo install sccache --no-default-features # make rust usable by all users chmod -R a+w /opt/rust diff --git a/rust/.rustfmt.toml b/rust/.rustfmt.toml index 9e52f9efacc8..9f852c00254c 100644 --- a/rust/.rustfmt.toml +++ b/rust/.rustfmt.toml @@ -45,7 +45,6 @@ use_field_init_shorthand = false force_explicit_abi = true condense_wildcard_suffixes = false color = "Auto" -required_version = "1.0.1" unstable_features = false disable_all_formatting = false skip_children = false