diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-18 18:02:58 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-19 07:03:18 -0800 |
| commit | 0cd54b85ef1fdad3bc4c1c4e1a989b9f6540a0fa (patch) | |
| tree | b2973ab6fdb99ec1d3ff8fd930f29cf78da183f4 /src/libcore/hash | |
| parent | cb29c468f38ba93f624277c2c3a8e46a4d85e619 (diff) | |
| download | rust-0cd54b85ef1fdad3bc4c1c4e1a989b9f6540a0fa.tar.gz rust-0cd54b85ef1fdad3bc4c1c4e1a989b9f6540a0fa.zip | |
Round 5 test fixes and rebase conflicts
Diffstat (limited to 'src/libcore/hash')
| -rw-r--r-- | src/libcore/hash/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/hash/mod.rs b/src/libcore/hash/mod.rs index 1086ae84ded..2e83334b937 100644 --- a/src/libcore/hash/mod.rs +++ b/src/libcore/hash/mod.rs @@ -158,7 +158,7 @@ pub trait Hasher { #[inline] #[unstable(feature = "hash", reason = "module was recently redesigned")] fn write_usize(&mut self, i: usize) { - if cfg!(target_pointer_size = "32") { + if cfg!(target_pointer_width = "32") { self.write_u32(i as u32) } else { self.write_u64(i as u64) @@ -241,7 +241,7 @@ mod impls { #[inline] fn hash(&self, state: &mut S) { let a: [u8; ::$ty::BYTES] = unsafe { - mem::transmute((*self as $uty).to_le() as $ty) + mem::transmute(*self) }; state.write(&a) } |