From a05a4567e7d29d927565f024b5daad1cc97d75d5 Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Thu, 5 Jan 2017 19:26:00 +0100
Subject: [PATCH 01/12] more CI integration

---
 .travis.yml  |  6 ++++++
 appveyor.yml | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 appveyor.yml

diff --git a/.travis.yml b/.travis.yml
index 3c226c879..88939dd5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
 language: rust
+
 rust: nightly
+
+os:
+  - linux
+  - osx
+
 sudo: false
 
 cache:
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 000000000..78420e231
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,34 @@
+environment:
+    global:
+        PROJECT_NAME: rust-clippy
+    matrix:
+        - TARGET: i686-pc-windows-gnu
+          MSYS2_BITS=32
+        - TARGET: i686-pc-windows-msvc
+          MSYS2_BITS=32
+        - TARGET: x86_64-pc-windows-gnu
+          MSYS2_BITS=64
+        - TARGET: x86_64-pc-windows-msvc
+          MSYS2_BITS=64
+
+install:
+    - curl -sSf -o rustup-init.exe https://win.rustup.rs/
+    - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
+    - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+    - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
+    - rustc -V
+    - cargo -V
+
+build: false
+
+test_script:
+    - cargo build --features debugging
+    - cargo test --features debugging
+    - mkdir -p rust/cargo/bin
+    - copy target/debug/cargo-clippy rust/cargo/bin/cargo-clippy
+    - PATH=%PATH%;rust/cargo/bin cargo clippy -- -D clippy
+    - cd clippy_lints && PATH=%PATH%;../rust/cargo/bin cargo clippy -- -D clippy && cd ..
+
+notifications:
+    - provider: Email
+      on_build_success: false

From 451cbed1d3c76308cb6fbcd32ed868366015932a Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Thu, 5 Jan 2017 23:16:00 +0100
Subject: [PATCH 02/12] Add appveyor badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 85c6136b9..d767fa13b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # rust-clippy
 
 [![Build Status](https://travis-ci.org/Manishearth/rust-clippy.svg?branch=master)](https://travis-ci.org/Manishearth/rust-clippy)
+[![Windows build status](https://ci.appveyor.com/api/projects/status/github/Manishearth/rust-clippy?svg=true)](https://ci.appveyor.com/project/Manishearth/rust-clippy)
 [![Clippy Linting Result](http://clippy.bashy.io/github/Manishearth/rust-clippy/master/badge.svg)](http://clippy.bashy.io/github/Manishearth/rust-clippy/master/log)
 [![Current Version](http://meritbadge.herokuapp.com/clippy)](https://crates.io/crates/clippy)
 [![License: MPL-2.0](https://img.shields.io/crates/l/clippy.svg)](#License)

From f4d0f38433b7a2313debb4cb1a4b7c856f078375 Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Thu, 5 Jan 2017 23:22:11 +0100
Subject: [PATCH 03/12] fix appveyor config

---
 appveyor.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 78420e231..9ccc615c0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,13 +3,13 @@ environment:
         PROJECT_NAME: rust-clippy
     matrix:
         - TARGET: i686-pc-windows-gnu
-          MSYS2_BITS=32
+          MSYS2_BITS: 32
         - TARGET: i686-pc-windows-msvc
-          MSYS2_BITS=32
+          MSYS2_BITS: 32
         - TARGET: x86_64-pc-windows-gnu
-          MSYS2_BITS=64
+          MSYS2_BITS: 64
         - TARGET: x86_64-pc-windows-msvc
-          MSYS2_BITS=64
+          MSYS2_BITS: 64
 
 install:
     - curl -sSf -o rustup-init.exe https://win.rustup.rs/

From b2f538f3cb6c9804692605d3cce4bdf93910a936 Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Fri, 6 Jan 2017 07:50:56 +0100
Subject: [PATCH 04/12] fix appveyor (hopefully)

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

diff --git a/appveyor.yml b/appveyor.yml
index 9ccc615c0..da9293484 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,9 +25,9 @@ test_script:
     - cargo build --features debugging
     - cargo test --features debugging
     - mkdir -p rust/cargo/bin
-    - copy target/debug/cargo-clippy rust/cargo/bin/cargo-clippy
-    - PATH=%PATH%;rust/cargo/bin cargo clippy -- -D clippy
-    - cd clippy_lints && PATH=%PATH%;../rust/cargo/bin cargo clippy -- -D clippy && cd ..
+    - copy target\debug\cargo-clippy C:\Users\appveyor\.cargo\bin\
+    - cargo clippy -- -D clippy
+    - cd clippy_lints && cargo clippy -- -D clippy && cd ..
 
 notifications:
     - provider: Email

From e4cfc7919010de68aa2022942f7ed287212f5080 Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Fri, 6 Jan 2017 12:46:36 +0100
Subject: [PATCH 05/12] add rust libs to PATH

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index da9293484..c3f46deca 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,7 @@ environment:
 install:
     - curl -sSf -o rustup-init.exe https://win.rustup.rs/
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
-    - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+    - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin;C:\Users\appveyor\.rustup\toolchains\nightly-%TARGET\lib
     - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
     - rustc -V
     - cargo -V

From 2a7bfc74d139e150bc4f955811f7a476a844ddee Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Fri, 6 Jan 2017 12:48:41 +0100
Subject: [PATCH 06/12] hopefully fix travis on OSX, too

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 88939dd5c..5e77154e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ install:
   - (cargo install rustfmt || true)
 
 script:
+ - PATH=$PATH:./node_modules/.bin
  - remark -f README.md > /dev/null
  - python util/update_lints.py -c
  - set -e

From 7b8ee6b7179a4807de6ceabc861f5e7196218cec Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Fri, 6 Jan 2017 17:52:56 +0100
Subject: [PATCH 07/12] fix typo in appveyor and bug in travis/OSX

---
 .travis.yml  | 1 +
 appveyor.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5e77154e5..dd64ea05b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,7 @@ script:
  - cp target/debug/cargo-clippy ~/rust/cargo/bin/cargo-clippy
  - PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy
  - cd clippy_lints && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ..
+ - set +e
 
 after_success:
 - ./.github/deploy.sh
diff --git a/appveyor.yml b/appveyor.yml
index c3f46deca..365d04cbc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,7 @@ environment:
 install:
     - curl -sSf -o rustup-init.exe https://win.rustup.rs/
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
-    - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin;C:\Users\appveyor\.rustup\toolchains\nightly-%TARGET\lib
+    - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin;C:\Users\appveyor\.rustup\toolchains\nightly-%TARGET%\lib
     - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
     - rustc -V
     - cargo -V

From 513bcbe9b3802976463edacee3418a4c06c78778 Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Fri, 6 Jan 2017 21:47:11 +0100
Subject: [PATCH 08/12] another appveyor trial

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 365d04cbc..7cbdbb3b4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,7 @@ environment:
 install:
     - curl -sSf -o rustup-init.exe https://win.rustup.rs/
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
-    - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin;C:\Users\appveyor\.rustup\toolchains\nightly-%TARGET%\lib
+    - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin;C:\Users\appveyor\.rustup\toolchains\nightly-%TARGET%\bin
     - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
     - rustc -V
     - cargo -V

From b9e5a1fb59ca6e42f12a3cc72e567202a9d7a6dd Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Fri, 6 Jan 2017 22:25:46 +0100
Subject: [PATCH 09/12] no mkdir needed on Windows

---
 appveyor.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 7cbdbb3b4..d127f5391 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,7 +24,6 @@ build: false
 test_script:
     - cargo build --features debugging
     - cargo test --features debugging
-    - mkdir -p rust/cargo/bin
     - copy target\debug\cargo-clippy C:\Users\appveyor\.cargo\bin\
     - cargo clippy -- -D clippy
     - cd clippy_lints && cargo clippy -- -D clippy && cd ..

From 42c48fde8a9d904183959a3416c3ca2f8eadd49b Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Sat, 7 Jan 2017 15:15:20 +0100
Subject: [PATCH 10/12] another set +e for travis on OSX

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index dd64ea05b..e9f5f88a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,3 +64,4 @@ after_success:
     else
       echo "Ignored"
     fi
+    set +e

From 07200e07adb366d12bfaaf39a9685e8fa7a188f2 Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Sun, 8 Jan 2017 12:21:33 +0100
Subject: [PATCH 11/12] Create .cargo/bin on Windows

---
 appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index d127f5391..fbbef595c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,6 +24,8 @@ build: false
 test_script:
     - cargo build --features debugging
     - cargo test --features debugging
+    - mkdir C:\Users\appveyor\.cargo
+    - mkdir C:\Users\appveyor\.cargo\bin
     - copy target\debug\cargo-clippy C:\Users\appveyor\.cargo\bin\
     - cargo clippy -- -D clippy
     - cd clippy_lints && cargo clippy -- -D clippy && cd ..

From f613cfcdac5057d864f4aebf1b28191635b6b070 Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Sun, 8 Jan 2017 13:21:26 +0100
Subject: [PATCH 12/12] Try .exe extension

---
 appveyor.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index fbbef595c..c5fb71c12 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,9 +24,7 @@ build: false
 test_script:
     - cargo build --features debugging
     - cargo test --features debugging
-    - mkdir C:\Users\appveyor\.cargo
-    - mkdir C:\Users\appveyor\.cargo\bin
-    - copy target\debug\cargo-clippy C:\Users\appveyor\.cargo\bin\
+    - copy target\debug\cargo-clippy.exe C:\Users\appveyor\.cargo\bin\
     - cargo clippy -- -D clippy
     - cd clippy_lints && cargo clippy -- -D clippy && cd ..