From d22f417c74bf23c5a9c34d10ef5a327d2ab6ebab Mon Sep 17 00:00:00 2001 From: gareth Date: Sat, 15 Jun 2013 17:58:38 +0100 Subject: [PATCH] Add IterBytes impls for float/f32/f64. This allows creating HashMaps with floats as keys. --- src/libstd/hash.rs | 11 +++++++++++ src/libstd/to_bytes.rs | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/src/libstd/hash.rs b/src/libstd/hash.rs index e9022445786..2d33be03580 100644 --- a/src/libstd/hash.rs +++ b/src/libstd/hash.rs @@ -558,4 +558,15 @@ mod tests { val & !(0xff << (byte * 8)) } } + + #[test] + fn test_float_hashes_differ() { + assert!(0.0.hash() != 1.0.hash()); + assert!(1.0.hash() != (-1.0).hash()); + } + + #[test] + fn test_float_hashes_of_zero() { + assert_eq!(0.0.hash(), (-0.0).hash()); + } } diff --git a/src/libstd/to_bytes.rs b/src/libstd/to_bytes.rs index c0c8b729f9e..6d7820ffea5 100644 --- a/src/libstd/to_bytes.rs +++ b/src/libstd/to_bytes.rs @@ -14,6 +14,7 @@ The `ToBytes` and `IterBytes` traits */ +use cast; use io; use io::Writer; use option::{None, Option, Some}; @@ -190,6 +191,35 @@ impl IterBytes for int { } } +impl IterBytes for float { + #[inline(always)] + fn iter_bytes(&self, lsb0: bool, f: Cb) -> bool { + (*self as f64).iter_bytes(lsb0, f) + } +} + +impl IterBytes for f32 { + #[inline(always)] + fn iter_bytes(&self, lsb0: bool, f: Cb) -> bool { + let i: u32 = unsafe { + // 0.0 == -0.0 so they should also have the same hashcode + cast::transmute(if *self == -0.0 { 0.0 } else { *self }) + }; + i.iter_bytes(lsb0, f) + } +} + +impl IterBytes for f64 { + #[inline(always)] + fn iter_bytes(&self, lsb0: bool, f: Cb) -> bool { + let i: u64 = unsafe { + // 0.0 == -0.0 so they should also have the same hashcode + cast::transmute(if *self == -0.0 { 0.0 } else { *self }) + }; + i.iter_bytes(lsb0, f) + } +} + impl<'self,A:IterBytes> IterBytes for &'self [A] { #[inline(always)] fn iter_bytes(&self, lsb0: bool, f: Cb) -> bool {