File tree Expand file tree Collapse file tree 2 files changed +5
-4
lines changed
branches/snap-stage3/src/libstd/collections/hash Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Original file line number Diff line number Diff line change 1
1
---
2
2
refs/heads/master: 6c065fc8cb036785f61ff03e05c1563cbb2dd081
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
- refs/heads/snap-stage3: ae7c534d042bb37e7e22cefabaa81b304638bc0b
4
+ refs/heads/snap-stage3: 6f2a1c946744dd6c1de7a1c556cb1333592dec62
5
5
refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
Original file line number Diff line number Diff line change 11
11
use clone:: Clone ;
12
12
use default:: Default ;
13
13
use hash;
14
+ use marker;
14
15
15
16
/// A trait representing stateful hashes which can be used to hash keys in a
16
17
/// `HashMap`.
@@ -37,17 +38,17 @@ pub trait HashState {
37
38
///
38
39
/// This struct has is 0-sized and does not need construction.
39
40
#[ unstable( feature = "std_misc" , reason = "hasher stuff is unclear" ) ]
40
- pub struct DefaultState < H > ;
41
+ pub struct DefaultState < H > ( marker :: PhantomData < H > ) ;
41
42
42
43
impl < H : Default + hash:: Hasher > HashState for DefaultState < H > {
43
44
type Hasher = H ;
44
45
fn hasher ( & self ) -> H { Default :: default ( ) }
45
46
}
46
47
47
48
impl < H > Clone for DefaultState < H > {
48
- fn clone ( & self ) -> DefaultState < H > { DefaultState }
49
+ fn clone ( & self ) -> DefaultState < H > { DefaultState ( marker :: PhantomData ) }
49
50
}
50
51
51
52
impl < H > Default for DefaultState < H > {
52
- fn default ( ) -> DefaultState < H > { DefaultState }
53
+ fn default ( ) -> DefaultState < H > { DefaultState ( marker :: PhantomData ) }
53
54
}
You can’t perform that action at this time.
0 commit comments