---

yaml
---
r: 49522
b: refs/heads/master
c: e2fde83
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 66770d20b3f7288145b29c70359128c0dddcb992
+refs/heads/master: e2fde83ce4488877d086c9720f5057d3dcefdfde
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea

trunk/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"),

trunk/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;