Skip to content

Commit 0c15196

Browse files
committed
---
yaml --- r: 20904 b: refs/heads/snap-stage3 c: 0308884 h: refs/heads/master v: v3
1 parent afcc341 commit 0c15196

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 4a216a000a512153220f0b036b3f3b34a1c47aab
4+
refs/heads/snap-stage3: 0308884416867110aa713b1daa10d12ff44a275a
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/compile-fail/pat-ref-enum.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fn matcher(x: option<int>) {
2-
alt x {
2+
match x {
33
ref some(i) => {} //~ ERROR expected identifier, found enum pattern
44
none => {}
55
}

branches/snap-stage3/src/test/compile-fail/resolve-inconsistent-binding-mode.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,39 @@ enum opts {
33
}
44

55
fn matcher1(x: opts) {
6-
alt x {
6+
match x {
77
a(ref i) | b(copy i) => {} //~ ERROR variable `i` is bound with different mode in pattern #2 than in pattern #1
88
c(_) => {}
99
}
1010
}
1111

1212
fn matcher2(x: opts) {
13-
alt x {
13+
match x {
1414
a(ref i) | b(i) => {} //~ ERROR variable `i` is bound with different mode in pattern #2 than in pattern #1
1515
c(_) => {}
1616
}
1717
}
1818

1919
fn matcher3(x: opts) {
20-
alt x {
20+
match x {
2121
a(ref mut i) | b(ref const i) => {} //~ ERROR variable `i` is bound with different mode in pattern #2 than in pattern #1
2222
c(_) => {}
2323
}
2424
}
2525

2626
fn matcher4(x: opts) {
27-
alt x {
27+
match x {
2828
a(ref mut i) | b(ref i) => {} //~ ERROR variable `i` is bound with different mode in pattern #2 than in pattern #1
2929
c(_) => {}
3030
}
3131
}
3232

3333

3434
fn matcher5(x: opts) {
35-
alt x {
35+
match x {
3636
a(ref i) | b(ref i) => {}
3737
c(_) => {}
3838
}
3939
}
4040

41-
fn main() {}
41+
fn main() {}

branches/snap-stage3/src/test/compile-fail/resolve-inconsistent-names.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fn main() {
22
let y = 1;
3-
alt y {
3+
match y {
44
a | b => {} //~ ERROR variable `a` from pattern #1 is not bound in pattern #2
55
//~^ ERROR variable `b` from pattern #2 is not bound in pattern #1
66
}

0 commit comments

Comments
 (0)