build: use clippy's debug build in integration test

[rust.git] / setup-toolchain.sh

diff --git a/setup-toolchain.sh b/setup-toolchain.sh
index 012d26a1046b39f7db5ae5acc71c9c7a55d7e4a1..aac18e3794647edbcb76dca2dac99f2e884d65de 100755 (executable)
--- a/setup-toolchain.sh
+++ b/setup-toolchain.sh
@@ -1,14 +1,13 @@
 #!/bin/bash
 # Set up the appropriate rustc toolchain
 
-cd "$(dirname "$0")" || exit
+set -e
 
-if ! command -v rustup-toolchain-install-master > /dev/null; then
-  cargo install \
-    --git https://github.com/kennytm/rustup-toolchain-install-master \
-    --bin rustup-toolchain-install-master \
-    --debug
+cd "$(dirname "$0")"
+
+if [[ "$CI" == true ]] || ! command -v rustup-toolchain-install-master > /dev/null; then
+  cargo install -Z install-upgrade rustup-toolchain-install-master --bin rustup-toolchain-install-master
 fi
 
-rustup-toolchain-install-master -f -n master -c rustc-dev
+rustup-toolchain-install-master -f -n master
 rustup override set master