Skip to content

Commit 5d823d4

Browse files
committed
Migrate std::map to use core::hash::Hash trait. Disable many hokey hashes.
1 parent f5093df commit 5d823d4

File tree

18 files changed

+736
-397
lines changed

18 files changed

+736
-397
lines changed

src/libcore/hash.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl <A: IterBytes> A: Hash {
6464
pure fn hash_keyed(k0: u64, k1: u64) -> u64 {
6565
unchecked {
6666
let s = &State(k0, k1);
67-
for self.iter_le_bytes |bytes| {
67+
for self.iter_bytes(true) |bytes| {
6868
s.input(bytes);
6969
}
7070
s.result_u64()
@@ -79,8 +79,8 @@ pure fn hash_keyed_2<A: IterBytes,
7979
k0: u64, k1: u64) -> u64 {
8080
unchecked {
8181
let s = &State(k0, k1);
82-
for a.iter_le_bytes |bytes| { s.input(bytes); }
83-
for b.iter_le_bytes |bytes| { s.input(bytes); }
82+
for a.iter_bytes(true) |bytes| { s.input(bytes); }
83+
for b.iter_bytes(true) |bytes| { s.input(bytes); }
8484
s.result_u64()
8585
}
8686
}
@@ -91,9 +91,9 @@ pure fn hash_keyed_3<A: IterBytes,
9191
k0: u64, k1: u64) -> u64 {
9292
unchecked {
9393
let s = &State(k0, k1);
94-
for a.iter_le_bytes |bytes| { s.input(bytes); }
95-
for b.iter_le_bytes |bytes| { s.input(bytes); }
96-
for c.iter_le_bytes |bytes| { s.input(bytes); }
94+
for a.iter_bytes(true) |bytes| { s.input(bytes); }
95+
for b.iter_bytes(true) |bytes| { s.input(bytes); }
96+
for c.iter_bytes(true) |bytes| { s.input(bytes); }
9797
s.result_u64()
9898
}
9999
}
@@ -105,10 +105,10 @@ pure fn hash_keyed_4<A: IterBytes,
105105
k0: u64, k1: u64) -> u64 {
106106
unchecked {
107107
let s = &State(k0, k1);
108-
for a.iter_le_bytes |bytes| { s.input(bytes); }
109-
for b.iter_le_bytes |bytes| { s.input(bytes); }
110-
for c.iter_le_bytes |bytes| { s.input(bytes); }
111-
for d.iter_le_bytes |bytes| { s.input(bytes); }
108+
for a.iter_bytes(true) |bytes| { s.input(bytes); }
109+
for b.iter_bytes(true) |bytes| { s.input(bytes); }
110+
for c.iter_bytes(true) |bytes| { s.input(bytes); }
111+
for d.iter_bytes(true) |bytes| { s.input(bytes); }
112112
s.result_u64()
113113
}
114114
}
@@ -121,11 +121,11 @@ pure fn hash_keyed_5<A: IterBytes,
121121
k0: u64, k1: u64) -> u64 {
122122
unchecked {
123123
let s = &State(k0, k1);
124-
for a.iter_le_bytes |bytes| { s.input(bytes); }
125-
for b.iter_le_bytes |bytes| { s.input(bytes); }
126-
for c.iter_le_bytes |bytes| { s.input(bytes); }
127-
for d.iter_le_bytes |bytes| { s.input(bytes); }
128-
for e.iter_le_bytes |bytes| { s.input(bytes); }
124+
for a.iter_bytes(true) |bytes| { s.input(bytes); }
125+
for b.iter_bytes(true) |bytes| { s.input(bytes); }
126+
for c.iter_bytes(true) |bytes| { s.input(bytes); }
127+
for d.iter_bytes(true) |bytes| { s.input(bytes); }
128+
for e.iter_bytes(true) |bytes| { s.input(bytes); }
129129
s.result_u64()
130130
}
131131
}

0 commit comments

Comments
 (0)