fixes

Author: pczarn

src/libstd/collections/hash/table.rs

@@ -80,7 +80,7 @@ struct RawBucket<K, V, M> {
 impl<K,V,M> Copy for RawBucket<K,V,M> {}
 
 #[derive(Clone)]
-pub struct TableRef<M>(M);
+pub struct TableRef<M>(pub M);
 
 impl<M: Copy> Copy for TableRef<M> {}
 
@@ -162,7 +162,7 @@ impl<K, V, M> Deref for TableRef<M> where RawTable<K, V>: BorrowFrom<M> {
     type Target = RawTable<K, V>;
 
     fn deref(&self) -> &RawTable<K, V> {
-        BorrowFrom::borrow_from(&mut self.0)
+        BorrowFrom::borrow_from(&self.0)
     }
 }
 
@@ -255,17 +255,18 @@ impl<K, V, M> Bucket<K, V, M> where RawTable<K, V>: BorrowFrom<M> {
                    -> Result<Bucket<K, V, M>, Bucket<K, V, M, bucket::TableIsEmpty>>
     {
         let table = TableRef(table);
+        let capacity = table.capacity();
         let ib_index = ib_index & (table.capacity() - 1);
         let bb = BareBucket {
             raw: unsafe {
                table.first_bucket_raw().offset(ib_index as int)
             },
             idx: ib_index,
-            capacity: table.capacity(),
+            capacity: capacity,
             table: table,
         };
 
-        if table.capacity() == 0 {
+        if capacity == 0 {
             Err(Bucket(bb))
         } else {
             Ok(Bucket(bb))
@@ -278,7 +279,7 @@ impl<K, V, M> Bucket<K, V, M> where RawTable<K, V>: BorrowFrom<M> {
 
     /// Narrows down the range of iteration, which must be a power of 2.
     pub fn iter_to(mut self, limit: usize) -> Bucket<K, V, M> {
-        assert!(limit <= TableRef(&self.table).capacity());
+        assert!(limit <= self.0.table.capacity());
         assert!(limit.is_power_of_two());
         self.0.capacity = limit;
         self
@@ -770,7 +771,7 @@ impl<K, V> Drop for RawTable<K, V> {
         // Avoid double drop of elements that have been already moved out.
         unsafe {
             if self.size != 0 {
-                for bucket in Bucket::raw_full_buckets(self) {
+                for bucket in Bucket::raw_full_buckets(&mut *self) {
                     ptr::read(bucket.kval);
                 }
             }