Skip to content

Commit 5e77d50

Browse files
committed
---
yaml --- r: 139221 b: refs/heads/try2 c: e2fde83 h: refs/heads/master i: 139219: a41d1ed v: v3
1 parent f37bce8 commit 5e77d50

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 66770d20b3f7288145b29c70359128c0dddcb992
8+
refs/heads/try2: e2fde83ce4488877d086c9720f5057d3dcefdfde
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librust/rust.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ enum UsageSource {
4747
UsgStr(&'self str)
4848
}
4949

50-
struct Command {
50+
struct Command<'self> {
5151
cmd: &'self str,
52-
action: Action/&self,
52+
action: Action<'self>,
5353
usage_line: &'self str,
54-
usage_full: UsageSource/&self
54+
usage_full: UsageSource<'self>,
5555
}
5656

57-
static commands: &'static [Command/&static] = &[
57+
static commands: &'static [Command<'static>] = &[
5858
Command{
5959
cmd: "build",
6060
action: Exec("rustc"),

branches/try2/src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -910,6 +910,7 @@ pub impl Parser {
910910
&& self.look_ahead(1u) == token::BINOP(token::AND)
911911
{
912912
self.bump(); self.bump();
913+
self.obsolete(*self.last_span, ObsoleteLifetimeNotation);
913914
match *self.token {
914915
token::IDENT(sid, _) => {
915916
let span = copy self.span;

0 commit comments

Comments
 (0)