Skip to content

Commit 9e6190d

Browse files
committed
Return nonzero exit code if there are errors at a stop point
1 parent cf636c2 commit 9e6190d

File tree

130 files changed

+275
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+275
-5
lines changed

src/librustc_driver/driver.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,12 @@ pub fn compile_input(sess: Session,
5151
output: &Option<Path>,
5252
addl_plugins: Option<Vec<String>>,
5353
control: CompileController) {
54-
macro_rules! controller_entry_point{($point: ident, $make_state: expr) => ({
55-
{
56-
let state = $make_state;
57-
(control.$point.callback)(state);
58-
}
54+
macro_rules! controller_entry_point{($point: ident, $tsess: expr, $make_state: expr) => ({
55+
let state = $make_state;
56+
(control.$point.callback)(state);
57+
58+
$tsess.abort_if_errors();
59+
5960
if control.$point.stop == Compilation::Stop {
6061
return;
6162
}
@@ -69,6 +70,7 @@ pub fn compile_input(sess: Session,
6970
let krate = phase_1_parse_input(&sess, cfg, input);
7071

7172
controller_entry_point!(after_parse,
73+
sess,
7274
CompileState::state_after_parse(input,
7375
&sess,
7476
outdir,
@@ -95,6 +97,7 @@ pub fn compile_input(sess: Session,
9597
};
9698

9799
controller_entry_point!(after_expand,
100+
sess,
98101
CompileState::state_after_expand(input,
99102
&sess,
100103
outdir,
@@ -108,6 +111,7 @@ pub fn compile_input(sess: Session,
108111
write_out_deps(&sess, input, &outputs, &id[]);
109112

110113
controller_entry_point!(after_write_deps,
114+
sess,
111115
CompileState::state_after_write_deps(input,
112116
&sess,
113117
outdir,
@@ -121,6 +125,7 @@ pub fn compile_input(sess: Session,
121125
control.make_glob_map);
122126

123127
controller_entry_point!(after_analysis,
128+
analysis.ty_cx.sess,
124129
CompileState::state_after_analysis(input,
125130
&analysis.ty_cx.sess,
126131
outdir,
@@ -147,6 +152,7 @@ pub fn compile_input(sess: Session,
147152
phase_5_run_llvm_passes(&sess, &trans, &outputs);
148153

149154
controller_entry_point!(after_llvm,
155+
sess,
150156
CompileState::state_after_llvm(input,
151157
&sess,
152158
outdir,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: -Z parse-only
12+
1113
// Test that the old fixed length array syntax is a parsing error.
1214

1315
fn main() {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: -Z parse-only
12+
1113
// Test you can't use a higher-ranked trait bound inside of a qualified
1214
// path (just won't parse).
1315

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: -Z parse-only
12+
1113
// error-pattern:expected `]`
1214

1315
// asterisk is bogus

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: -Z parse-only
12+
1113
// error-pattern: expected
1214

1315
fn main() {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: -Z parse-only
12+
1113
// error-pattern: expected
1214

1315
fn main() {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: -Z parse-only
12+
1113
fn main() {
1214
let x: [isize 3]; //~ ERROR expected one of `(`, `+`, `::`, `;`, `<`, or `]`, found `3`
1315
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: -Z parse-only
12+
1113
fn main() {
1214
struct Foo { x: isize }
1315
match (Foo { x: 10 }) {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: -Z parse-only
12+
1113

1214
// ignore-tidy-tab
1315

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// compile-flags: -Z parse-only
12+
1113

1214
// ignore-tidy-tab
1315

0 commit comments

Comments
 (0)