auto merge of #8626 : kballard/rust/issue-8615, r=catamorphism

Fixes #8615.

2 files changed, 14 insertions, 1 deletions

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 135f7162157..9aa2bf3f063 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -1127,7 +1127,6 @@ impl Parser {
         match *self.token {
             token::LIFETIME(*) => {
                 let lifetime = self.parse_lifetime();
-                self.bump();
                 return self.parse_ty_closure(sigil, Some(lifetime));
             }
 
diff --git a/src/test/compile-fail/issue-8615.rs b/src/test/compile-fail/issue-8615.rs
new file mode 100644
index 00000000000..10d3e9ed3f1
--- /dev/null
+++ b/src/test/compile-fail/issue-8615.rs
@@ -0,0 +1,14 @@
+// Copyright 2013 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.
+
+fn main() {
+    let _: @'static whatever fn(); //~ ERROR expected `fn`, found `whatever`
+    let _: @'static fn();
+}