Skip to content

Commit 4d77f86

Browse files
committed
---
yaml --- r: 37756 b: refs/heads/try c: c946c87 h: refs/heads/master v: v3
1 parent 221551f commit 4d77f86

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5-
refs/heads/try: 3beff12309f4e78c74a9353eb0b68c2c8bf8e887
5+
refs/heads/try: c946c87b6f9cd536309dfba09abdc9af32729f34
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libsyntax/parse/obsolete.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ pub enum ObsoleteSyntax {
2323
ObsoleteClassTraits,
2424
ObsoletePrivSection,
2525
ObsoleteModeInFnType,
26-
ObsoleteByMutRefMode,
2726
ObsoleteMoveInit,
2827
ObsoleteBinaryMove
2928
}
@@ -106,10 +105,6 @@ impl Parser : ObsoleteReporter {
106105
"to use a (deprecated) mode in a fn type, you should \
107106
give the argument an explicit name (like `&&v: int`)"
108107
),
109-
ObsoleteByMutRefMode => (
110-
"by-mutable-reference mode",
111-
"Declare an argument of type &mut T instead"
112-
),
113108
ObsoleteMoveInit => (
114109
"initializer-by-move",
115110
"Write `let foo = move bar` instead"

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ use obsolete::{
2020
ObsoleteLowerCaseKindBounds, ObsoleteLet,
2121
ObsoleteFieldTerminator, ObsoleteStructCtor,
2222
ObsoleteWith, ObsoleteClassMethod, ObsoleteClassTraits,
23-
ObsoleteModeInFnType, ObsoleteByMutRefMode,
24-
ObsoleteMoveInit, ObsoleteBinaryMove,
23+
ObsoleteModeInFnType, ObsoleteMoveInit, ObsoleteBinaryMove,
2524
};
2625
use ast::{_mod, add, arg, arm, attribute,
2726
bind_by_ref, bind_by_implicit_ref, bind_by_value, bind_by_move,
@@ -627,12 +626,7 @@ impl Parser {
627626
}
628627
629628
fn parse_arg_mode() -> mode {
630-
if self.eat(token::BINOP(token::AND)) {
631-
self.obsolete(copy self.span,
632-
ObsoleteByMutRefMode);
633-
// Bogus mode, but doesn't matter since it's an error
634-
expl(by_ref)
635-
} else if self.eat(token::BINOP(token::MINUS)) {
629+
if self.eat(token::BINOP(token::MINUS)) {
636630
expl(by_move)
637631
} else if self.eat(token::ANDAND) {
638632
expl(by_ref)
@@ -642,7 +636,9 @@ impl Parser {
642636
} else {
643637
expl(by_copy)
644638
}
645-
} else { infer(self.get_id()) }
639+
} else {
640+
infer(self.get_id())
641+
}
646642
}
647643
648644
fn is_named_argument() -> bool {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
fn main() {
2+
let v = [ (1, 2), (3, 4), (5, 6) ];
3+
for v.each |&(x, y)| {
4+
io::println(y.to_str());
5+
io::println(x.to_str());
6+
}
7+
}
8+

0 commit comments

Comments
 (0)