Skip to content

Commit 5a53b62

Browse files
committed
---
yaml --- r: 181694 b: refs/heads/snap-stage3 c: 6f2a1c9 h: refs/heads/master v: v3
1 parent 3f9e6ac commit 5a53b62

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
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 6c065fc8cb036785f61ff03e05c1563cbb2dd081
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: ae7c534d042bb37e7e22cefabaa81b304638bc0b
4+
refs/heads/snap-stage3: 6f2a1c946744dd6c1de7a1c556cb1333592dec62
55
refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/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)