diff options
| author | bors <bors@rust-lang.org> | 2016-10-06 21:53:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-06 21:53:29 -0700 |
| commit | b4e89728f450aba54efb9fa88e95a84acaae862b (patch) | |
| tree | ea782e6767fd61a1283d7391ad6bbbc8be5dcffc /src/libstd/collections/hash/table.rs | |
| parent | 75c155b834e3bd667ca50187741c1b7abbf9e3df (diff) | |
| parent | 45f2b6abb54c121dc7f7b60c9c6692f54a0d2f5c (diff) | |
Auto merge of #36753 - srinivasreddy:hash, r=nrc
run rustfmt on libstd/collections/hash folder
Diffstat (limited to 'src/libstd/collections/hash/table.rs')
| -rw-r--r-- | src/libstd/collections/hash/table.rs | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs index afd833d8bdd..b12f132a3a9 100644 --- a/src/libstd/collections/hash/table.rs +++ b/src/libstd/collections/hash/table.rs @@ -448,10 +448,10 @@ impl<'t, K, V> FullBucket<K, V, &'t mut RawTable<K, V>> { unsafe { *self.raw.hash = EMPTY_BUCKET; (EmptyBucket { - raw: self.raw, - idx: self.idx, - table: self.table, - }, + raw: self.raw, + idx: self.idx, + table: self.table, + }, ptr::read(self.raw.key), ptr::read(self.raw.val)) } @@ -643,13 +643,13 @@ impl<K, V> RawTable<K, V> { // One check for overflow that covers calculation and rounding of size. let size_of_bucket = size_of::<u64>() - .checked_add(size_of::<K>()) - .unwrap() - .checked_add(size_of::<V>()) - .unwrap(); + .checked_add(size_of::<K>()) + .unwrap() + .checked_add(size_of::<V>()) + .unwrap(); assert!(size >= capacity.checked_mul(size_of_bucket) - .expect("capacity overflow"), + .expect("capacity overflow"), "capacity overflow"); let buffer = allocate(size, malloc_alignment); @@ -672,10 +672,8 @@ impl<K, V> RawTable<K, V> { let keys_size = self.capacity * size_of::<K>(); let buffer = *self.hashes as *const u8; - let (keys_offset, vals_offset, oflo) = calculate_offsets(hashes_size, - keys_size, - align_of::<K>(), - align_of::<V>()); + let (keys_offset, vals_offset, oflo) = + calculate_offsets(hashes_size, keys_size, align_of::<K>(), align_of::<V>()); debug_assert!(!oflo, "capacity overflow"); unsafe { RawBucket { @@ -990,9 +988,7 @@ impl<'a, K, V> Iterator for Drain<'a, K, V> { } impl<'a, K, V> ExactSizeIterator for Drain<'a, K, V> { fn len(&self) -> usize { - unsafe { - (**self.table).size() - } + unsafe { (**self.table).size() } } } |
