Skip to content

Commit d04c41c

Browse files
nhynestqchen
authored andcommitted
Use version invariant rustfmt (#2886)
1 parent 6b2590e commit d04c41c

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

docker/install/ubuntu_install_rust.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ apt-get update && apt-get install -y --no-install-recommends curl
99
export RUSTUP_HOME=/opt/rust
1010
export CARGO_HOME=/opt/rust
1111
# this rustc is one supported by the installed version of rust-sgx-sdk
12-
curl -s -S -L https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain nightly-2019-01-28
12+
curl -s -S -L https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain nightly-2019-03-24
1313
. $CARGO_HOME/env
14-
rustup component add rust-src
15-
cargo install sccache
16-
cargo install rustfmt-nightly --version 1.0.1 --force
17-
cargo install xargo
14+
rustup component add rustfmt
15+
cargo install sccache --no-default-features
1816

1917
# make rust usable by all users
2018
chmod -R a+w /opt/rust

rust/.rustfmt.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ use_field_init_shorthand = false
4545
force_explicit_abi = true
4646
condense_wildcard_suffixes = false
4747
color = "Auto"
48-
required_version = "1.0.1"
4948
unstable_features = false
5049
disable_all_formatting = false
5150
skip_children = false

0 commit comments

Comments
 (0)