Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Rust] Use version invariant rustfmt #2886

Merged
merged 1 commit into from
Mar 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions docker/install/ubuntu_install_rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion rust/.rustfmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down