Minor cleanup of hashmap
auto merge of #7875 : sstewartgallus/rust/fubar, r=alexcrichton