Skip to content

Commit f4f1729

Browse files
committed
---
yaml --- r: 30235 b: refs/heads/incoming c: 5236a30 h: refs/heads/master i: 30233: 40b9ca5 30231: f924ec7 v: v3
1 parent 98979b2 commit f4f1729

File tree

4 files changed

+10
-19
lines changed

4 files changed

+10
-19
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 5b4d5cee03bdc297361f52b34e6e09b7b64161ea
9+
refs/heads/incoming: 5236a304c46f6f08bf43f08187e071c77c6622f5
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/test/run-pass/expr-alt-generic.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@ fn test_bool() {
1515
}
1616

1717
type t = {a: int, b: int};
18-
impl t : cmp::Eq {
19-
pure fn eq(&&other: t) -> bool {
20-
self.a == other.a && self.b == other.b
21-
}
22-
}
2318

2419
fn test_rec() {
25-
fn compare_rec(t1: t, t2: t) -> bool { return t1 == t2; }
20+
fn compare_rec(t1: t, t2: t) -> bool {
21+
t1.a == t2.a && t1.b == t2.b
22+
}
2623
test_generic::<t>({a: 1, b: 2}, compare_rec);
2724
}
2825

branches/incoming/src/test/run-pass/expr-block-generic.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@ fn test_bool() {
1717
}
1818

1919
type t = {a: int, b: int};
20-
impl t : cmp::Eq {
21-
pure fn eq(&&other: t) -> bool {
22-
self.a == other.a && self.b == other.b
23-
}
24-
}
2520

2621
fn test_rec() {
27-
fn compare_rec(t1: t, t2: t) -> bool { return t1 == t2; }
22+
fn compare_rec(t1: t, t2: t) -> bool {
23+
t1.a == t2.a && t1.b == t2.b
24+
}
2825
test_generic::<t>({a: 1, b: 2}, compare_rec);
2926
}
3027

branches/incoming/src/test/run-pass/expr-if-generic.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@ fn test_bool() {
1717
}
1818

1919
type t = {a: int, b: int};
20-
impl t : cmp::Eq {
21-
pure fn eq(&&other: t) -> bool {
22-
self.a == other.a && self.b == other.b
23-
}
24-
}
2520

2621
fn test_rec() {
27-
fn compare_rec(t1: t, t2: t) -> bool { return t1 == t2; }
22+
fn compare_rec(t1: t, t2: t) -> bool {
23+
t1.a == t2.a && t1.b == t2.b
24+
}
2825
test_generic::<t>({a: 1, b: 2}, {a: 2, b: 3}, compare_rec);
2926
}
3027

0 commit comments

Comments
 (0)