Auto merge of #36753 - srinivasreddy:hash, r=nrc

[rust.git] / src / libstd / collections / hash / table.rs

diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs
index afd833d8bdd81dfbebf49c4c1f5a9a8322dba0c4..b12f132a3a97f7db7edc003200c2e6ad202bea78 100644 (file)
--- a/src/libstd/collections/hash/table.rs
+++ b/src/libstd/collections/hash/table.rs
@@ -448,10 +448,10 @@ pub fn take(mut self) -> (EmptyBucket<K, V, &'t mut RawTable<K, V>>, 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 @@ unsafe fn new_uninitialized(capacity: usize) -> 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 @@ fn first_bucket_raw(&self) -> RawBucket<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 @@ fn size_hint(&self) -> (usize, Option<usize>) {
 }
 impl<'a, K, V> ExactSizeIterator for Drain<'a, K, V> {
     fn len(&self) -> usize {
-        unsafe {
-            (**self.table).size()
-        }
+        unsafe { (**self.table).size() }
     }
 }