Return nonzero exit code if there are errors at a stop point

Author: fhahn

src/librustc_driver/driver.rs

@@ -51,11 +51,12 @@ pub fn compile_input(sess: Session,
                      output: &Option<Path>,
                      addl_plugins: Option<Vec<String>>,
                      control: CompileController) {
-    macro_rules! controller_entry_point{($point: ident, $make_state: expr) => ({
-        {
-            let state = $make_state;
-            (control.$point.callback)(state);
-        }
+    macro_rules! controller_entry_point{($point: ident, $tsess: expr, $make_state: expr) => ({
+        let state = $make_state;
+        (control.$point.callback)(state);
+
+        $tsess.abort_if_errors();
+
         if control.$point.stop == Compilation::Stop {
             return;
         }
@@ -69,6 +70,7 @@ pub fn compile_input(sess: Session,
             let krate = phase_1_parse_input(&sess, cfg, input);
 
             controller_entry_point!(after_parse,
+                                    sess,
                                     CompileState::state_after_parse(input,
                                                                     &sess,
                                                                     outdir,
@@ -95,6 +97,7 @@ pub fn compile_input(sess: Session,
         };
 
         controller_entry_point!(after_expand,
+                                sess,
                                 CompileState::state_after_expand(input,
                                                                  &sess,
                                                                  outdir,
@@ -108,6 +111,7 @@ pub fn compile_input(sess: Session,
         write_out_deps(&sess, input, &outputs, &id[..]);
 
         controller_entry_point!(after_write_deps,
+                                sess,
                                 CompileState::state_after_write_deps(input,
                                                                      &sess,
                                                                      outdir,
@@ -122,6 +126,7 @@ pub fn compile_input(sess: Session,
                                                    control.make_glob_map);
 
         controller_entry_point!(after_analysis,
+                                analysis.ty_cx.sess,
                                 CompileState::state_after_analysis(input,
                                                                    &analysis.ty_cx.sess,
                                                                    outdir,
@@ -148,6 +153,7 @@ pub fn compile_input(sess: Session,
     phase_5_run_llvm_passes(&sess, &trans, &outputs);
 
     controller_entry_point!(after_llvm,
+                            sess,
                             CompileState::state_after_llvm(input,
                                                            &sess,
                                                            outdir,

src/test/compile-fail/mod_file_disambig.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 mod mod_file_disambig_aux; //~ ERROR file for module `mod_file_disambig_aux` found at both
 
 fn main() {

src/test/compile-fail/mod_file_not_owning.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // error-pattern: cannot declare a new module at this location
 
 mod mod_file_not_owning_aux1;

src/test/parse-fail/array-old-syntax-1.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // Test that the old fixed length array syntax is a parsing error.
 
 fn main() {

src/test/parse-fail/ascii-only-character-escape.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 fn main() {
     let x = "\x80"; //~ ERROR may only be used
     let y = "\xff"; //~ ERROR may only be used

src/test/parse-fail/associated-types-project-from-hrtb-explicit.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // Test you can't use a higher-ranked trait bound inside of a qualified
 // path (just won't parse).
 

src/test/parse-fail/attr-bad-meta.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // error-pattern:expected `]`
 
 // asterisk is bogus

src/test/parse-fail/attr-before-eof.rs

@@ -8,4 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 #[derive(Debug)] //~ERROR expected item after attributes

src/test/parse-fail/attr-before-ext.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 fn main() {
     #[attr] //~ ERROR expected item after attributes
     println!("hi");

src/test/parse-fail/attr-before-let.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 fn main() {
     #[attr] //~ ERROR expected item
     let __isize = 0;

src/test/parse-fail/attr-before-stmt.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // error-pattern:expected item
 
 fn f() {

src/test/parse-fail/attr-dangling-in-fn.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // error-pattern:expected item
 
 fn f() {

src/test/parse-fail/attr-dangling-in-mod.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // error-pattern:expected item
 
 fn main() {

src/test/parse-fail/attr.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 #![feature(lang_items)]
 
 fn main() {}

src/test/parse-fail/attrs-after-extern-mod.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // Constants (static variables) can be used to match in patterns, but mutable
 // statics cannot. This ensures that there's some form of error if this is
 // attempted.

src/test/parse-fail/bad-char-literals.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // ignore-tidy-cr
 // ignore-tidy-tab
 fn main() {
@@ -21,7 +23,8 @@ fn main() {
     //~^^ ERROR: character constant must be escaped: \n
 
     // note that this is a literal "\r" byte
-    ''; //~ ERROR: character constant must be escaped: \r
+    '
+'; //~ ERROR: character constant must be escaped: \r
 
     // note that this is a literal tab character here
     '	';

src/test/parse-fail/bad-lit-suffixes.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 
 extern crate
     "foo"suffix //~ ERROR extern crate name with a suffix is illegal

src/test/parse-fail/bad-match.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // error-pattern: expected
 
 fn main() {

src/test/parse-fail/bad-name.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // error-pattern: expected
 
 fn main() {

src/test/parse-fail/bad-value-ident-false.rs

@@ -8,5 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 fn false() { } //~ ERROR expected identifier, found keyword `false`
 fn main() { }

src/test/parse-fail/bad-value-ident-true.rs

@@ -8,5 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 fn true() { } //~ ERROR expected identifier, found keyword `true`
 fn main() { }

src/test/parse-fail/better-expected.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 fn main() {
     let x: [isize 3]; //~ ERROR expected one of `(`, `+`, `::`, `;`, `<`, or `]`, found `3`
 }

src/test/parse-fail/bind-struct-early-modifiers.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 fn main() {
     struct Foo { x: isize }
     match (Foo { x: 10 }) {

src/test/parse-fail/byte-literals.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 
 // ignore-tidy-tab
 

src/test/parse-fail/byte-string-literals.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 
 // ignore-tidy-tab
 

src/test/parse-fail/circular_modules_hello.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // ignore-test: this is an auxiliary file for circular-modules-main.rs
 
 mod circular_modules_main;

src/test/parse-fail/circular_modules_main.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 #[path = "circular_modules_hello.rs"]
 mod circular_modules_hello; //~ERROR: circular modules
 

src/test/parse-fail/class-implements-bad-trait.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // error-pattern:nonexistent
 class cat : nonexistent {
   let meows: usize;

src/test/parse-fail/column-offset-1-based.rs

@@ -8,4 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 # //~ ERROR 11:1: 11:2 error: expected one of `!` or `[`, found `<eof>`

src/test/parse-fail/doc-before-attr.rs

@@ -8,5 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 /// hi
 #[derive(Debug)] //~ERROR expected item after attributes

src/test/parse-fail/doc-before-eof.rs

@@ -8,4 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 /// hi //~ERROR expected item after doc comment

src/test/parse-fail/doc-before-extern-rbrace.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 extern {
     /// hi
 }

src/test/parse-fail/doc-before-macro.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 fn main() {
     /// hi
     println!("hi");

src/test/parse-fail/doc-before-rbrace.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 fn main() {
     println!("Hi"); /// hi
     //~^ ERROR expected item after doc comment

src/test/parse-fail/doc-before-semi.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 fn main() {
     /// hi
     ;

src/test/parse-fail/duplicate-visibility.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // error-pattern:unmatched visibility `pub`
 extern {
     pub pub fn foo();

src/test/parse-fail/empty-impl-semicolon.rs

@@ -8,4 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 impl Foo; //~ ERROR expected one of `(`, `+`, `::`, `<`, `for`, `where`, or `{`, found `;`

src/test/parse-fail/extern-crate-as-no-string-help.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // Tests that the proper help is displayed in the error message
 
 extern crate foo as bar;

src/test/parse-fail/extern-expected-fn-or-brace.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// compile-flags: -Z parse-only
+
 // Verifies that the expected token errors for `extern crate` are
 // raised