Skip to content

Commit d5faa01

Browse files
committed
---
yaml --- r: 184039 b: refs/heads/auto c: 6f2a1c9 h: refs/heads/master i: 184037: 6b1a072 184035: 1183514 184031: f21deee v: v3
1 parent 78aa91e commit d5faa01

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: ae7c534d042bb37e7e22cefabaa81b304638bc0b
13+
refs/heads/auto: 6f2a1c946744dd6c1de7a1c556cb1333592dec62
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/collections/hash/state.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use clone::Clone;
1212
use default::Default;
1313
use hash;
14+
use marker;
1415

1516
/// A trait representing stateful hashes which can be used to hash keys in a
1617
/// `HashMap`.
@@ -37,17 +38,17 @@ pub trait HashState {
3738
///
3839
/// This struct has is 0-sized and does not need construction.
3940
#[unstable(feature = "std_misc", reason = "hasher stuff is unclear")]
40-
pub struct DefaultState<H>;
41+
pub struct DefaultState<H>(marker::PhantomData<H>);
4142

4243
impl<H: Default + hash::Hasher> HashState for DefaultState<H> {
4344
type Hasher = H;
4445
fn hasher(&self) -> H { Default::default() }
4546
}
4647

4748
impl<H> Clone for DefaultState<H> {
48-
fn clone(&self) -> DefaultState<H> { DefaultState }
49+
fn clone(&self) -> DefaultState<H> { DefaultState(marker::PhantomData) }
4950
}
5051

5152
impl<H> Default for DefaultState<H> {
52-
fn default() -> DefaultState<H> { DefaultState }
53+
fn default() -> DefaultState<H> { DefaultState(marker::PhantomData) }
5354
}

0 commit comments

Comments
 (0)