Skip to content

Commit

Permalink
auto merge of rust-lang#7156 : Dretch/rust/float-hash, r=graydon
Browse files Browse the repository at this point in the history
It can sometimes be useful to have maps/sets of floating point values.

Doing arithmetic with floats and then using them as keys is, of course, not a good idea.
  • Loading branch information
bors committed Jun 16, 2013
2 parents d0f88cd + d22f417 commit d1a2360
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 0 deletions.
11 changes: 11 additions & 0 deletions src/libstd/hash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
30 changes: 30 additions & 0 deletions src/libstd/to_bytes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ The `ToBytes` and `IterBytes` traits
*/

use cast;
use io;
use io::Writer;
use option::{None, Option, Some};
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit d1a2360

Please sign in to comment.