Skip to content

Commit 8cb5efe

Browse files
committed
---
yaml --- r: 149552 b: refs/heads/try2 c: 922eb47 h: refs/heads/master v: v3
1 parent 7c05658 commit 8cb5efe

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
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: 848cbb4e130d7ec9609b36b3f6f7a68099cbd6a7
8+
refs/heads/try2: 922eb47a20c432e079444032f9ece9a5a39f2080
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/run-pass/deriving-global.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,21 @@ mod submod {
2727
// function calls, then being in a submodule will (correctly)
2828
// cause errors about unrecognised module `std` (or `extra`)
2929
#[deriving(Eq, Ord, TotalEq, TotalOrd,
30+
Hash,
3031
Clone, DeepClone,
3132
Show, Rand,
3233
Encodable, Decodable)]
3334
enum A { A1(uint), A2(int) }
3435

3536
#[deriving(Eq, Ord, TotalEq, TotalOrd,
37+
Hash,
3638
Clone, DeepClone,
3739
Show, Rand,
3840
Encodable, Decodable)]
3941
struct B { x: uint, y: int }
4042

4143
#[deriving(Eq, Ord, TotalEq, TotalOrd,
44+
Hash,
4245
Clone, DeepClone,
4346
Show, Rand,
4447
Encodable, Decodable)]

branches/try2/src/test/run-pass/deriving-meta-multiple.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
// option. This file may not be copied, modified, or distributed
1111
// except according to those terms.
1212

13-
#[deriving(Eq)]
14-
#[deriving(Clone)]
13+
use std::hash::hash;
14+
15+
#[deriving(Eq, Clone, Hash)]
1516
struct Foo {
1617
bar: uint,
1718
baz: int
@@ -22,4 +23,5 @@ pub fn main() {
2223

2324
a == a; // check for Eq impl w/o testing its correctness
2425
a.clone(); // check for Clone impl w/o testing its correctness
26+
hash(&a); // check for Hash impl w/o testing its correctness
2527
}

branches/try2/src/test/run-pass/deriving-meta.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
// option. This file may not be copied, modified, or distributed
1111
// except according to those terms.
1212

13-
#[deriving(Eq, Clone)]
13+
use std::hash::hash;
14+
15+
#[deriving(Eq, Clone, Hash)]
1416
struct Foo {
1517
bar: uint,
1618
baz: int
@@ -21,4 +23,5 @@ pub fn main() {
2123

2224
a == a; // check for Eq impl w/o testing its correctness
2325
a.clone(); // check for Clone impl w/o testing its correctness
26+
hash(&a); // check for Hash impl w/o testing its correctness
2427
}

0 commit comments

Comments
 (0)