From 8aa47990da1a057f82183cc9a0edec05e34e56b2 Mon Sep 17 00:00:00 2001
From: Kevin Ballard <kevin@sb.org>
Date: Mon, 19 Aug 2013 14:55:35 -0700
Subject: [PATCH] Don't skip token after @'static

Fixes #8615.
---
 src/libsyntax/parse/parser.rs       |  1 -
 src/test/compile-fail/issue-8615.rs | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 src/test/compile-fail/issue-8615.rs

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index de7abb8d1f4..d397616cd9f 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();
+}