---

yaml
---
r: 51603
b: refs/heads/incoming
c: e2fde83
h: refs/heads/master
i:
  51601: 3ee03f4
  51599: 42dffba
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 66770d20b3f7288145b29c70359128c0dddcb992
+refs/heads/incoming: e2fde83ce4488877d086c9720f5057d3dcefdfde
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

branches/incoming/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;