From eba90802b1e5aaf3d6f704acd1c4b6a5991d7291 Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Fri, 25 Oct 2019 00:47:20 +0700
Subject: [PATCH 1/2] appveyor: Minor config change

---
 appveyor.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6168d66b1559..6f5f2e4cb412 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,7 @@
 environment:
     global:
         PROJECT_NAME: rust-clippy
+        RUST_BACKTRACE: 1
     matrix:
         #- TARGET: i686-pc-windows-gnu
         #- TARGET: i686-pc-windows-msvc
@@ -15,6 +16,7 @@ branches:
 
 cache:
     - '%USERPROFILE%\.cargo'
+# before cache
 after_test:
     - cargo install -Z install-upgrade cargo-cache --debug
     - cargo cache --autoclean
@@ -22,21 +24,22 @@ after_test:
 install:
     - curl -sSf -o rustup-init.exe https://win.rustup.rs/
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly --profile=minimal
-    - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+    - set PATH=%USERPROFILE%\.cargo\bin;%PATH%
+    - rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
     - del rust-toolchain
     - cargo install -Z install-upgrade rustup-toolchain-install-master
     - rustup-toolchain-install-master -f -n master -c rustc-dev
-    - rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
-    - rustup default master
-    - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
+    - rustup override set master
     - rustc -V
     - cargo -V
 
+# Build settings, not to be confused with "before_build" and "after_build".
 build: false
 
-test_script:
-    - set RUST_BACKTRACE=1
+build_script:
     - cargo build --features debugging
+
+test_script:
     - cargo test --features debugging
 
 notifications:

From 97d76f55cedae0ff34c8b93797ea078ed0991973 Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Fri, 25 Oct 2019 00:49:09 +0700
Subject: [PATCH 2/2] appveyor: Leading space change only

---
 appveyor.yml | 58 ++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6f5f2e4cb412..58693cb5cc34 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,47 +1,47 @@
 environment:
-    global:
-        PROJECT_NAME: rust-clippy
-        RUST_BACKTRACE: 1
-    matrix:
-        #- TARGET: i686-pc-windows-gnu
-        #- TARGET: i686-pc-windows-msvc
-        #- TARGET: x86_64-pc-windows-gnu
-        - TARGET: x86_64-pc-windows-msvc
+  global:
+    PROJECT_NAME: rust-clippy
+    RUST_BACKTRACE: 1
+  matrix:
+    #- TARGET: i686-pc-windows-gnu
+    #- TARGET: i686-pc-windows-msvc
+    #- TARGET: x86_64-pc-windows-gnu
+    - TARGET: x86_64-pc-windows-msvc
 
 branches:
-    # Only build AppVeyor on r+ and try branch
-    only:
-      - auto
-      - try
+  # Only build AppVeyor on r+ and try branch
+  only:
+    - auto
+    - try
 
 cache:
-    - '%USERPROFILE%\.cargo'
+  - '%USERPROFILE%\.cargo'
 # before cache
 after_test:
-    - cargo install -Z install-upgrade cargo-cache --debug
-    - cargo cache --autoclean
+  - cargo install -Z install-upgrade cargo-cache --debug
+  - cargo cache --autoclean
 
 install:
-    - curl -sSf -o rustup-init.exe https://win.rustup.rs/
-    - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly --profile=minimal
-    - set PATH=%USERPROFILE%\.cargo\bin;%PATH%
-    - rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
-    - del rust-toolchain
-    - cargo install -Z install-upgrade rustup-toolchain-install-master
-    - rustup-toolchain-install-master -f -n master -c rustc-dev
-    - rustup override set master
-    - rustc -V
-    - cargo -V
+  - curl -sSf -o rustup-init.exe https://win.rustup.rs/
+  - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly --profile=minimal
+  - set PATH=%USERPROFILE%\.cargo\bin;%PATH%
+  - rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
+  - del rust-toolchain
+  - cargo install -Z install-upgrade rustup-toolchain-install-master
+  - rustup-toolchain-install-master -f -n master -c rustc-dev
+  - rustup override set master
+  - rustc -V
+  - cargo -V
 
 # Build settings, not to be confused with "before_build" and "after_build".
 build: false
 
 build_script:
-    - cargo build --features debugging
+  - cargo build --features debugging
 
 test_script:
-    - cargo test --features debugging
+  - cargo test --features debugging
 
 notifications:
-    - provider: Email
-      on_build_success: false
+  - provider: Email
+    on_build_success: false