From 4846ec96446dc6b7075125e469f5d2dbea12a2ca Mon Sep 17 00:00:00 2001
From: daa84 <daa84@inbox.ru>
Date: Thu, 20 Apr 2017 17:18:25 +0300
Subject: [PATCH] .

---
 appveyor.yml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6734ed2..7583dde 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,14 +1,27 @@
+environment:
+  global:
+    PROJECT_NAME: rustfmt
+  matrix:
+    - TARGET: x86_64-pc-windows-gnu
+      CHANNEL: stable
+
 install:
+  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:RUST_VERSION}-${env:TARGET}.exe"
+  - rust-%RUST_VERSION%-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
+  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
+  - if "%TARGET%" == "i686-pc-windows-gnu" set PATH=%PATH%;C:\msys64\mingw32\bin
+  - if "%TARGET%" == "x86_64-pc-windows-gnu" set PATH=%PATH%;C:\msys64\mingw64\bin
+
   - ps: Start-FileDownload "https://static.rust-lang.org/dist/channel-rust-stable"
   - ps: $env:RUST_VERSION = Get-Content channel-rust-stable | select -first 1 | %{$_.split('-')[1]}
-  - if NOT "%RUST%" == "nightly" set RUST_VERSION=%RUST%
-  - SET RUST_URL=https://static.rust-lang.org/dist/rust-%RUST_VERSION%-%ARCH%-pc-windows-gnu.exe
-  - SET PATH=C:\Rust\bin;C:\msys64\mingw%BITS%\bin;%PATH%;C:\msys64\usr\bin
-  - ps: Start-FileDownload %RUST_URL% -FileName rust-dist.exe
+  - if NOT "%CHANNEL%" == "stable" set RUST_VERSION=%CHANNEL%
+  - SET RUST_URL=https://static.rust-lang.org/dist/rust-${env:RUST_VERSION}-${env:TARGET}.exe
+  - SET PATH=C:\Rust\bin;C:\msys64\mingw64\bin;%PATH%;C:\msys64\usr\bin
+  - ps: Start-FileDownload $env:RUST_URL -FileName rust-dist.exe
   - rust-dist.exe /VERYSILENT /NORESTART /COMPONENTS="Rustc,Gcc,Cargo,Std" /DIR="C:\Rust"
   - rustc -V
   - cargo -V
-  - pacman --noconfirm -S mingw-w64-%ARCH%-gtk3
+  - pacman --noconfirm -S mingw-w64-x86_64-gtk3
 
 build_script:
   - cargo test