]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #15257 : erickt/rust/hashmap, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 2 Jul 2014 07:31:41 +0000 (07:31 +0000)
committerbors <bors@rust-lang.org>
Wed, 2 Jul 2014 07:31:41 +0000 (07:31 +0000)
While `HashMap::new` and `HashMap::with_capacity` were being initialized with a random `SipHasher`, it turns out that `HashMap::from_iter` was just using the default instance of `SipHasher`, which wasn't randomized. This closes that bug, and also inlines some important methods.

1  2 
src/libstd/lib.rs

Simple merge