diff options
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 10 | ||||
| -rw-r--r-- | src/test/parse-fail/lifetime-semicolon.rs | 19 |
2 files changed, 25 insertions, 4 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index e089e630e57..bfa42e76129 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4046,10 +4046,12 @@ impl<'a> Parser<'a> { let mut err = self.diagnostic().struct_span_err(self.span, &msg); let span_hi = self.span.hi; - let span_hi = if self.parse_ty().is_ok() { - self.span.hi - } else { - span_hi + let span_hi = match self.parse_ty() { + Ok(..) => self.span.hi, + Err(ref mut err) => { + err.cancel(); + span_hi + } }; let msg = format!("did you mean a single argument type &'a Type, \ 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 |