Merge pull request #2309 from rust-lang-nursery/rustc-monitor

Use rustc_driver::run

Author: oli-obk

src/driver.rs

@@ -12,7 +12,7 @@ extern crate rustc_plugin;
 extern crate syntax;
 
 use rustc_driver::{driver, Compilation, CompilerCalls, RustcDefaultCalls};
-use rustc::session::{config, CompileIncomplete, Session};
+use rustc::session::{config, Session};
 use rustc::session::config::{ErrorOutputType, Input};
 use std::path::PathBuf;
 use std::process::Command;
@@ -153,47 +153,44 @@ pub fn main() {
         })
         .expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust");
 
-    rustc_driver::in_rustc_thread(|| {
-        // Setting RUSTC_WRAPPER causes Cargo to pass 'rustc' as the first argument.
-        // We're invoking the compiler programmatically, so we ignore this/
-        let mut orig_args: Vec<String> = env::args().collect();
-        if orig_args.len() <= 1 {
-            std::process::exit(1);
-        }
-        if orig_args[1] == "rustc" {
-            // we still want to be able to invoke it normally though
-            orig_args.remove(1);
-        }
-        // this conditional check for the --sysroot flag is there so users can call
-        // `clippy_driver` directly
-        // without having to pass --sysroot or anything
-        let mut args: Vec<String> = if orig_args.iter().any(|s| s == "--sysroot") {
-            orig_args.clone()
-        } else {
-            orig_args
-                .clone()
-                .into_iter()
-                .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::var("CLIPPY_TESTS")
-            .ok()
-            .map_or(false, |val| val == "true")
-            || orig_args.iter().any(|s| s == "--emit=metadata");
-
-        if clippy_enabled {
-            args.extend_from_slice(&["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()]);
-        }
+    // Setting RUSTC_WRAPPER causes Cargo to pass 'rustc' as the first argument.
+    // We're invoking the compiler programmatically, so we ignore this/
+    let mut orig_args: Vec<String> = env::args().collect();
+    if orig_args.len() <= 1 {
+        std::process::exit(1);
+    }
+    if orig_args[1] == "rustc" {
+        // we still want to be able to invoke it normally though
+        orig_args.remove(1);
+    }
+    // this conditional check for the --sysroot flag is there so users can call
+    // `clippy_driver` directly
+    // without having to pass --sysroot or anything
+    let mut args: Vec<String> = if orig_args.iter().any(|s| s == "--sysroot") {
+        orig_args.clone()
+    } else {
+        orig_args
+            .clone()
+            .into_iter()
+            .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::var("CLIPPY_TESTS")
+        .ok()
+        .map_or(false, |val| val == "true")
+        || orig_args.iter().any(|s| s == "--emit=metadata");
+
+    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(CompileIncomplete::Errored(_)) = result {
-            std::process::exit(1);
-        }
-    }).expect("rustc_thread failed");
+    let mut ccc = ClippyCompilerCalls::new(clippy_enabled);
+    rustc_driver::run(move || {
+        rustc_driver::run_compiler(&args, &mut ccc, None, None)
+    });
 }

tests/compile-test.rs

@@ -46,7 +46,9 @@ fn config(dir: &'static str, mode: &'static str) -> compiletest::Config {
     config.target_rustcflags = Some(format!("-L {0} -L {0}/deps -Dwarnings", host_libs().display()));
 
     config.mode = cfg_mode;
-    config.build_base = {
+    config.build_base = if rustc_test_suite().is_some() {
+        PathBuf::from("/tmp/clippy_test_build_base")
+    } else {
         let mut path = std::env::current_dir().unwrap();
         path.push("target/debug/test_build_base");
         path

tests/ui/absurd-extreme-comparisons.stderr

@@ -143,3 +143,5 @@ error: <-comparison of unit values detected. This will always be false
    |
    = note: `-D unit-cmp` implied by `-D warnings`
 
+error: aborting due to 18 previous errors
+

tests/ui/approx_const.stderr

@@ -114,3 +114,5 @@ error: approximate value of `f{32, 64}::consts::SQRT_2` found. Consider using it
 55 |     let my_sq2 = 1.4142;
    |                  ^^^^^^
 
+error: aborting due to 19 previous errors
+

tests/ui/arithmetic.stderr

@@ -69,3 +69,5 @@ error: floating-point arithmetic detected
 29 |     -f;
    |     ^^
 
+error: aborting due to 11 previous errors
+

tests/ui/array_indexing.stderr

@@ -116,3 +116,5 @@ error: range is out of bounds
 44 |     &empty[..4];
    |      ^^^^^^^^^^
 
+error: aborting due to 19 previous errors
+

tests/ui/assign_ops.stderr

@@ -134,3 +134,5 @@ error: manual implementation of an assign operation
 40 |     s = s + "bla";
    |     ^^^^^^^^^^^^^ help: replace it with: `s += "bla"`
 
+error: aborting due to 22 previous errors
+

tests/ui/assign_ops2.stderr

@@ -48,3 +48,5 @@ error: variable appears on both sides of an assignment operation
 15 |     a &= a & 1;
    |     ^^^^^^^^^^ help: replace it with: `a &= 1`
 
+error: aborting due to 8 previous errors
+

tests/ui/attrs.stderr

@@ -20,3 +20,5 @@ error: the since field must contain a semver-compliant version
 30 | #[deprecated(since = "1")]
    |              ^^^^^^^^^^^
 
+error: aborting due to 3 previous errors
+

tests/ui/bit_masks.stderr

@@ -106,3 +106,5 @@ error: ineffective bit mask: `x | 1` compared to `8`, is the same as x compared
 55 |     x | 1 >= 8;
    |     ^^^^^^^^^^
 
+error: aborting due to 17 previous errors
+

tests/ui/blacklisted_name.stderr

@@ -84,3 +84,5 @@ error: use of a blacklisted/placeholder name `baz`
 35 |     if let Some(ref mut baz) = Some(42) {}
    |                         ^^^
 
+error: aborting due to 14 previous errors
+

tests/ui/block_in_if_condition.stderr

@@ -50,3 +50,5 @@ error: this boolean expression can be simplified
    |
    = note: `-D nonminimal-bool` implied by `-D warnings`
 
+error: aborting due to 5 previous errors
+

tests/ui/bool_comparison.stderr

@@ -24,3 +24,5 @@ error: equality checks against false can be replaced by a negation
 10 |     if false == x { "yes" } else { "no" };
    |        ^^^^^^^^^^ help: try simplifying it as shown: `!x`
 
+error: aborting due to 4 previous errors
+

tests/ui/booleans.stderr

@@ -175,3 +175,5 @@ error: this boolean expression can be simplified
 58 |     let _ = !c ^ c || !a.is_some();
    |             ^^^^^^^^^^^^^^^^^^^^^^ help: try: `!c ^ c || a.is_none()`
 
+error: aborting due to 21 previous errors
+

tests/ui/borrow_box.stderr

@@ -28,3 +28,5 @@ error: you seem to be trying to use `&Box<T>`. Consider using just `&T`
 22 |     fn test4(a: &Box<bool>);
    |                 ^^^^^^^^^^ help: try: `&bool`
 
+error: aborting due to 4 previous errors
+

tests/ui/box_vec.stderr

@@ -7,3 +7,5 @@ error: you seem to be trying to use `Box<Vec<T>>`. Consider using just `Vec<T>`
    = note: `-D box-vec` implied by `-D warnings`
    = help: `Vec<T>` is already on the heap, `Box<Vec<T>>` makes an extra allocation.
 
+error: aborting due to previous error
+

tests/ui/builtin-type-shadow.stderr

@@ -17,3 +17,5 @@ error[E0308]: mismatched types
   = note: expected type `u32`
              found type `{integer}`
 
+error: aborting due to 2 previous errors
+

tests/ui/bytecount.stderr

@@ -22,3 +22,5 @@ error: You appear to be counting bytes the naive way
 22 |     let _ = x.iter().filter(|a| b + 1 == **a).count(); // naive byte count
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: Consider using the bytecount crate: `bytecount::count(x, b + 1)`
 
+error: aborting due to 3 previous errors
+

tests/ui/cast.stderr

@@ -178,3 +178,5 @@ error: casting to the same type is unnecessary (`bool` -> `bool`)
 39 |     false as bool;
    |     ^^^^^^^^^^^^^
 
+error: aborting due to 28 previous errors
+

tests/ui/cast_lossless_float.stderr

@@ -60,3 +60,5 @@ error: casting u32 to f64 may become silently lossy if types change
 14 |     1u32 as f64;
    |     ^^^^^^^^^^^ help: try: `f64::from(1u32)`
 
+error: aborting due to 10 previous errors
+

tests/ui/cast_lossless_integer.stderr

@@ -108,3 +108,5 @@ error: casting u32 to u64 may become silently lossy if types change
 23 |     1u32 as u64;
    |     ^^^^^^^^^^^ help: try: `u64::from(1u32)`
 
+error: aborting due to 18 previous errors
+

tests/ui/cast_size.stderr

@@ -120,3 +120,5 @@ error: casting i32 to usize may lose the sign of the value
 22 |     1i32 as usize;
    |     ^^^^^^^^^^^^^
 
+error: aborting due to 19 previous errors
+

tests/ui/char_lit_as_u8.stderr

@@ -8,3 +8,5 @@ error: casting character literal to u8. `char`s are 4 bytes wide in rust, so cas
   = help: Consider using a byte literal instead:
           b'a'
 
+error: aborting due to previous error
+

tests/ui/cmp_nan.stderr

@@ -72,3 +72,5 @@ error: doomed comparison with NAN, use `std::{f32,f64}::is_nan()` instead
 21 |     y >= std::f64::NAN;
    |     ^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 12 previous errors
+

tests/ui/cmp_null.stderr

@@ -12,3 +12,5 @@ error: Comparing with null is better expressed by the .is_null() method
 16 |     if m == ptr::null_mut() {
    |        ^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 2 previous errors
+

tests/ui/cmp_owned.stderr

@@ -36,3 +36,5 @@ error: this creates an owned instance just for comparison
 30 |         self.to_owned() == *other
    |         ^^^^^^^^^^^^^^^ try calling implementing the comparison without allocating
 
+error: aborting due to 6 previous errors
+

tests/ui/collapsible_if.stderr

@@ -240,3 +240,5 @@ help: try
 112 | }
     |
 
+error: aborting due to 13 previous errors
+

tests/ui/complex_types.stderr

@@ -90,3 +90,5 @@ error: very complex type used. Consider factoring parts into `type` definitions
 40 |     let _y: Vec<Vec<Box<(u32, u32, u32, u32)>>> = vec![];
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 15 previous errors
+

tests/ui/conf_bad_arg.stderr

@@ -6,3 +6,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #2
   |
   = help: add #![feature(plugin)] to the crate attributes to enable
 
+error: aborting due to previous error
+

tests/ui/conf_bad_toml.stderr

@@ -6,3 +6,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #2
   |
   = help: add #![feature(plugin)] to the crate attributes to enable
 
+error: aborting due to previous error
+

tests/ui/conf_bad_type.stderr

@@ -6,3 +6,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #2
   |
   = help: add #![feature(plugin)] to the crate attributes to enable
 
+error: aborting due to previous error
+

tests/ui/conf_french_blacklisted_name.stderr

@@ -6,3 +6,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #2
   |
   = help: add #![feature(plugin)] to the crate attributes to enable
 
+error: aborting due to previous error
+

tests/ui/conf_path_non_string.stderr

@@ -6,3 +6,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #2
   |
   = help: add #![feature(plugin)] to the crate attributes to enable
 
+error: aborting due to previous error
+

tests/ui/conf_unknown_key.stderr

@@ -6,3 +6,5 @@ error[E0658]: compiler plugins are experimental and possibly buggy (see issue #2
   |
   = help: add #![feature(plugin)] to the crate attributes to enable
 
+error: aborting due to previous error
+

tests/ui/const_static_lifetime.stderr

@@ -78,3 +78,5 @@ error: Constants have by default a `'static` lifetime
 24 | const VAR_ARRAY: &'static [u8; 1] = b"T"; // ERROR Consider removing 'static.
    |                  -^^^^^^^-------- help: consider removing `'static`: `&[u8; 1]`
 
+error: aborting due to 13 previous errors
+

tests/ui/copies.stderr

@@ -33,3 +33,5 @@ error: This else block is redundant.
             }
 
 
+error: aborting due to 2 previous errors
+

tests/ui/cstring.stderr

@@ -12,3 +12,5 @@ help: assign the `CString` to a variable to extend its lifetime
 7 |     CString::new("foo").unwrap().as_ptr();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to previous error
+

tests/ui/cyclomatic_complexity.stderr

@@ -269,3 +269,5 @@ error: the function has a cyclomatic complexity of 8
     |
     = help: you could split it up into multiple smaller functions
 
+error: aborting due to 20 previous errors
+

tests/ui/cyclomatic_complexity_attr_used.stderr

@@ -13,3 +13,5 @@ error: the function has a cyclomatic complexity of 3
    = note: `-D cyclomatic-complexity` implied by `-D warnings`
    = help: you could split it up into multiple smaller functions
 
+error: aborting due to previous error
+

tests/ui/deprecated.stderr

@@ -24,3 +24,5 @@ error: lint unstable_as_mut_slice has been removed: `Vec::as_mut_slice` has been
 10 | #[warn(unstable_as_mut_slice)]
    |        ^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 4 previous errors
+

tests/ui/derive.stderr

@@ -106,3 +106,5 @@ note: consider deriving `Clone` or removing `Copy`
 87 | | }
    | |_^
 
+error: aborting due to 7 previous errors
+

tests/ui/diverging_sub_expression.stderr

@@ -36,3 +36,5 @@ error: sub-expression diverges
 37 |             _ => true || break,
    |                          ^^^^^
 
+error: aborting due to 6 previous errors
+

tests/ui/dlist.stderr

@@ -47,3 +47,5 @@ error: I see you're using a LinkedList! Perhaps you meant some other data struct
    |
    = help: a VecDeque might work
 
+error: aborting due to 6 previous errors
+

tests/ui/doc.stderr

@@ -180,3 +180,5 @@ error: you should put bare URLs between `<`/`>` or make a proper Markdown link
 168 | /// Not ok: http://www.unicode.org/reports/tr9/#Reordering_Resolved_Levels
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: aborting due to 30 previous errors
+

tests/ui/double_neg.stderr

@@ -6,3 +6,5 @@ error: `--x` could be misinterpreted as pre-decrement by C programmers, is usual
   |
   = note: `-D double-neg` implied by `-D warnings`
 
+error: aborting due to previous error
+

tests/ui/double_parens.stderr

@@ -30,3 +30,5 @@ error: Consider removing unnecessary double parentheses
 32 |     (())
    |     ^^^^
 
+error: aborting due to 5 previous errors
+

tests/ui/drop_forget_copy.stderr

@@ -72,3 +72,5 @@ note: argument has type SomeStruct
 42 |     forget(s4);
    |            ^^
 
+error: aborting due to 6 previous errors
+

tests/ui/drop_forget_ref.stderr

@@ -216,3 +216,5 @@ note: argument has type &SomeStruct
 59 |     std::mem::forget(&SomeStruct);
    |                      ^^^^^^^^^^^
 
+error: aborting due to 18 previous errors
+

tests/ui/duplicate_underscore_argument.stderr

@@ -6,3 +6,5 @@ error: `darth` already exists, having another argument having almost the same na
   |
   = note: `-D duplicate-underscore-argument` implied by `-D warnings`
 
+error: aborting due to previous error
+

tests/ui/else_if_without_else.stderr

@@ -18,3 +18,5 @@ error: if expression with an `else if`, but without a final `else`
 49 | |     }
    | |_____^ help: add an `else` block here
 
+error: aborting due to 2 previous errors
+