about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-01-13 20:38:12 +0000
committerbors <bors@rust-lang.org>2016-01-13 20:38:12 +0000
commit6089ebaddb8a9d663f798c26eb2ca73a9514a59a (patch)
treed9ee23d4a6241bc0d97f6c3f003441b7f23e4c68 /src/test
parentac9be00ecc3492b58b60b91cf2ce7d2a36ebb4d2 (diff)
parente61d21fe3d59797f0bc30ded9e943bfe9f5364e4 (diff)
downloadrust-6089ebaddb8a9d663f798c26eb2ca73a9514a59a.tar.gz
rust-6089ebaddb8a9d663f798c26eb2ca73a9514a59a.zip
Auto merge of #30813 - fhahn:fix-ice-semicolon-in-lifetime, r=nrc
This PR fixes an ICE due to an DiagnosticsBuilder not being canceld or emitted.

Ideally it would use `Handler::cancel`, but I did not manage to get a `&mut` reference to the diagnostics handler.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/parse-fail/lifetime-semicolon.rs19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/test/parse-fail/lifetime-semicolon.rs b/src/test/parse-fail/lifetime-semicolon.rs
new file mode 100644
index 00000000000..7010d0e7deb
--- /dev/null
+++ b/src/test/parse-fail/lifetime-semicolon.rs
@@ -0,0 +1,19 @@
+// Copyright 2016 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.
+
+// compile-flags: -Z parse-only
+
+struct Foo<'a, 'b> {
+    a: &'a &'b i32
+}
+
+fn foo<'a, 'b>(x: &mut Foo<'a; 'b>) {}
+//~^ ERROR expected `,` or `>` after lifetime name, found `;`
+//~^^ NOTE did you mean a single argument type &'a Type, or did you mean the comma-separated