From: Ralf Jung <post@ralfj.de>
Date: Sat, 28 Sep 2019 15:36:20 +0000 (-0400)
Subject: sync AppVeyor CI script with Travis
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=638d989629675288207fa2031a1fca531a9eaf9e;p=rust.git

sync AppVeyor CI script with Travis
---

diff --git a/.appveyor.yml b/.appveyor.yml
index 391ff042daf..c3d575403cb 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,16 +17,21 @@ cache:
     - '%USERPROFILE%\.rustup'
 
 install:
+    # Compute the rust version we use
+    - set /p RUSTC_HASH=<rust-version
     # Install Rust
     - curl -sSf --retry 3 -o rustup-init.exe https://win.rustup.rs/
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain stable
     - set PATH=%USERPROFILE%\.cargo\bin;%PATH%
+    - rustup default stable
+    - rustup uninstall beta
+    - rustup update
     # Install "master" toolchain
     - cargo install rustup-toolchain-install-master & exit 0
-    - set /p RUSTC_HASH=<rust-version
     - rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c cargo -c rust-src
     - rustup default master
     - rustc --version
+    - cargo --version
 
 build_script:
     - set RUSTFLAGS=-C debug-assertions