about summary refs log tree commit diff
path: root/src/test/auxiliary
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-02-08 14:41:02 +0000
committerbors <bors@rust-lang.org>2015-02-08 14:41:02 +0000
commitbfdcd34e82fca5186f0565c28c5c9b6a9f9b6c76 (patch)
treefac01ba25394767610ca5cb624d091154a773609 /src/test/auxiliary
parent725cc06464abda7a657780f12feaefb7f10333c6 (diff)
parent8f2ab66ab631a11113ac2fbb66384ce7c2fc34d5 (diff)
downloadrust-bfdcd34e82fca5186f0565c28c5c9b6a9f9b6c76.tar.gz
rust-bfdcd34e82fca5186f0565c28c5c9b6a9f9b6c76.zip
Auto merge of #22054 - LeoTestard:include-parse-errors, r=alexcrichton
Makes the compilation abort when a parse error is encountered while
trying to parse an item in an included file. The previous behaviour was
to stop processing the file when a token that can't start an item was
encountered, without producing any error. Fixes #21146.
Diffstat (limited to 'src/test/auxiliary')
-rw-r--r--src/test/auxiliary/issue-21146-inc.rs13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/test/auxiliary/issue-21146-inc.rs b/src/test/auxiliary/issue-21146-inc.rs
new file mode 100644
index 00000000000..1b740d112e9
--- /dev/null
+++ b/src/test/auxiliary/issue-21146-inc.rs
@@ -0,0 +1,13 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// include file for issue-21146.rs
+
+parse_error