From 64da379c8c6c967a451817dc4909eeb0055351e7 Mon Sep 17 00:00:00 2001 From: Kevin Butler Date: Sun, 25 Oct 2015 00:57:42 +0100 Subject: libsyntax: better error for lifetimes in patterns Previously, if you copied a signature from a trait definition such as: ``` fn foo<'a>(&'a Bar) -> bool {} ``` and moved it into an `impl`, there would be an error message: "unexpected token `'a`" Adding to the error message that a pattern is expected should help users to find the actual problem with using a lifetime here. --- src/libsyntax/parse/parser.rs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index fcebe035961..092013a4753 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3196,6 +3196,10 @@ impl<'a> Parser<'a> { // Parse &pat / &mut pat try!(self.expect_and()); let mutbl = try!(self.parse_mutability()); + if let token::Lifetime(ident) = self.token { + return Err(self.fatal(&format!("unexpected lifetime `{}` in pattern", ident))); + } + let subpat = try!(self.parse_pat_nopanic()); pat = PatRegion(subpat, mutbl); } -- cgit 1.4.1-3-g733a5