summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-03-22 16:28:54 -0700
committerPatrick Walton <pcwalton@mimiga.net>2013-03-22 22:24:36 -0700
commite2fde83ce4488877d086c9720f5057d3dcefdfde (patch)
treea2ce81b8d750642b5c4019ce4011dfe131e0aef8 /src
parent66770d20b3f7288145b29c70359128c0dddcb992 (diff)
downloadrust-e2fde83ce4488877d086c9720f5057d3dcefdfde.tar.gz
rust-e2fde83ce4488877d086c9720f5057d3dcefdfde.zip
libsyntax: Stop parsing old lifetime syntax
Diffstat (limited to 'src')
-rw-r--r--src/librust/rust.rc8
-rw-r--r--src/libsyntax/parse/parser.rs1
2 files changed, 5 insertions, 4 deletions
diff --git a/src/librust/rust.rc b/src/librust/rust.rc
index 2ebc162eb6a..b0edff033c3 100644
--- a/src/librust/rust.rc
+++ b/src/librust/rust.rc
@@ -47,14 +47,14 @@ enum UsageSource {
     UsgStr(&'self str)
 }
 
-struct Command {
+struct Command<'self> {
     cmd: &'self str,
-    action: Action/&self,
+    action: Action<'self>,
     usage_line: &'self str,
-    usage_full: UsageSource/&self
+    usage_full: UsageSource<'self>,
 }
 
-static commands: &'static [Command/&static] = &[
+static commands: &'static [Command<'static>] = &[
     Command{
         cmd: "build",
         action: Exec("rustc"),
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index b7cc0b35023..af64bf07b7c 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -910,6 +910,7 @@ pub impl Parser {
                 && self.look_ahead(1u) == token::BINOP(token::AND)
             {
                 self.bump(); self.bump();
+                self.obsolete(*self.last_span, ObsoleteLifetimeNotation);
                 match *self.token {
                     token::IDENT(sid, _) => {
                         let span = copy self.span;