Skip to content

Commit e4c8d96

Browse files
committed
---
yaml --- r: 47323 b: refs/heads/try c: fcd4af1 h: refs/heads/master i: 47321: 2deaddf 47319: 5b096d2 v: v3
1 parent b99632c commit e4c8d96

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
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: 3bbcac322669cff3abde5be937cc4ec3860f3985
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
5-
refs/heads/try: 6bff18ea0de2f96a4103c11bc183b380f6d2c83a
5+
refs/heads/try: fcd4af169fc6ed45090625c354460a911177533b
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/test/compile-fail/issue-3601.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test
1211
struct HTMLImageData {
1312
image: Option<~str>
1413
}
@@ -25,18 +24,19 @@ enum NodeKind {
2524
Element(ElementData)
2625
}
2726

28-
enum NodeData = {
27+
struct NodeData {
2928
kind: ~NodeKind
30-
};
29+
}
3130

3231
fn main() {
3332
let mut id = HTMLImageData { image: None };
3433
let ed = ElementData { kind: ~HTMLImageElement(id) };
35-
let n = NodeData({kind : ~Element(ed)});
34+
let n = NodeData {kind : ~Element(ed)};
35+
// n.b. span could be better
3636
match n.kind {
37-
~Element(ed) => match ed.kind {
38-
~HTMLImageElement(d) if d.image.is_some() => { true }
37+
~Element(ed) => match ed.kind { //~ ERROR non-exhaustive patterns
38+
~HTMLImageElement(ref d) if d.image.is_some() => { true }
3939
},
40-
_ => fail!(~"WAT") //~ ERROR wat
40+
_ => fail!(~"WAT") //~ ERROR unreachable pattern
4141
};
4242
}

0 commit comments

Comments
 (0)