Skip to content

Early exit for empty HashMap (issue #38880) #48035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 15, 2018
Merged

Early exit for empty HashMap (issue #38880) #48035

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9bc5986
38880 don't compute hash when searching an empty HashMap
technicalguy Feb 6, 2018
dcdd2c4
38880 use search_mut function rather than search_hashed
technicalguy Feb 6, 2018
29f7148
38880 remove redundant extra function
technicalguy Feb 12, 2018
fd78621
38880 fixup add missing mut
technicalguy Feb 12, 2018
a295ec1
38880 restore original entry(key) method
technicalguy Feb 13, 2018
94c3c84
38880 hashmap check size=0, not just capacity=0
technicalguy Feb 13, 2018
f3330ce
38880 fix incorrect negation
technicalguy Feb 13, 2018
e034ddd
38880 remove unnecessary self.table.size check
technicalguy Feb 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
38880 restore original entry(key) method
  • Loading branch information
@technicalguy
technicalguy committed Feb 13, 2018
commit a295ec1ec9d7616474a620a8acd15944aaf0c638
4 changes: 3 additions & 1 deletion src/libstd/collections/hash/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,9 @@ impl<K, V, S> HashMap<K, V, S>
pub fn entry(&mut self, key: K) -> Entry<K, V> {
// Gotta resize now.
self.reserve(1);
self.search_mut(&key).into_entry(key).expect("unreachable")
let hash = self.make_hash(&key);
search_hashed(&mut self.table, hash, |q| q.eq(&key))
.into_entry(key).expect("unreachable")
}

/// Returns the number of elements in the map.
Expand Down