File tree Expand file tree Collapse file tree 2 files changed +5
-4
lines changed
branches/auto/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 @@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
10
10
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
11
11
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
12
12
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13
- refs/heads/auto: ae7c534d042bb37e7e22cefabaa81b304638bc0b
13
+ refs/heads/auto: 6f2a1c946744dd6c1de7a1c556cb1333592dec62
14
14
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
15
15
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
16
16
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
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