From 5c2549482a9974a145e5c45c61d03f9606d5e8a3 Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
Date: Tue, 28 Feb 2017 12:47:48 +0100
Subject: [PATCH] Get cargo clippy working on 64 bit windows again

fixes #1244
---
 appveyor.yml |  4 +---
 src/main.rs  | 43 ++++++++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 74b659b0b0f..d83d3478c32 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,10 +4,8 @@ environment:
     matrix:
         - TARGET: i686-pc-windows-gnu
           MSYS2_BITS: 32
-          RUN_CARGO_CLIPPY: true
         - TARGET: i686-pc-windows-msvc
           MSYS2_BITS: 32
-          RUN_CARGO_CLIPPY: true
         - TARGET: x86_64-pc-windows-gnu
           MSYS2_BITS: 64
         - TARGET: x86_64-pc-windows-msvc
@@ -29,7 +27,7 @@ test_script:
     - cargo test --features debugging
     - copy target\debug\cargo-clippy.exe C:\Users\appveyor\.cargo\bin\
     - cargo clippy -- -D clippy
-    - if defined RUN_CARGO_CLIPPY cd clippy_lints && cargo clippy -- -D clippy && cd ..
+    - cd clippy_lints && cargo clippy -- -D clippy && cd ..
 
 notifications:
     - provider: Email
diff --git a/src/main.rs b/src/main.rs
index 9d67ba3958a..c7681364f18 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -244,30 +244,31 @@ pub fn main() {
                 .expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust")
         };
 
-        // this conditional check for the --sysroot flag is there so users can call `cargo-clippy` directly
-        // without having to pass --sysroot or anything
-        let mut args: Vec<String> = if env::args().any(|s| s == "--sysroot") {
-            env::args().collect()
-        } else {
-            env::args().chain(Some("--sysroot".to_owned())).chain(Some(sys_root)).collect()
-        };
+        rustc_driver::in_rustc_thread(|| {
+            // this conditional check for the --sysroot flag is there so users can call `cargo-clippy` directly
+            // without having to pass --sysroot or anything
+            let mut args: Vec<String> = if env::args().any(|s| s == "--sysroot") {
+                env::args().collect()
+            } else {
+                env::args().chain(Some("--sysroot".to_owned())).chain(Some(sys_root)).collect()
+            };
 
-        // this check ensures that dependencies are built but not linted and the final crate is
-        // linted but not built
-        let clippy_enabled = env::args().any(|s| s == "-Zno-trans");
+            // this check ensures that dependencies are built but not linted and the final crate is
+            // linted but not built
+            let clippy_enabled = env::args().any(|s| s == "-Zno-trans");
 
-        if clippy_enabled {
-            args.extend_from_slice(&["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()]);
-        }
-
-        let mut ccc = ClippyCompilerCalls::new(clippy_enabled);
-        let (result, _) = rustc_driver::run_compiler(&args, &mut ccc, None, None);
-
-        if let Err(err_count) = result {
-            if err_count > 0 {
-                std::process::exit(1);
+            if clippy_enabled {
+                args.extend_from_slice(&["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()]);
             }
-        }
+
+            let mut ccc = ClippyCompilerCalls::new(clippy_enabled);
+            let (result, _) = rustc_driver::run_compiler(&args, &mut ccc, None, None);
+            if let Err(err_count) = result {
+                if err_count > 0 {
+                    std::process::exit(1);
+                }
+            }
+        }).expect("rustc_thread failed");
     }
 }