---

yaml
---
r: 159199
b: refs/heads/snap-stage3
c: 6277e3b
h: refs/heads/master
i:
  159197: a1415a5
  159195: a7c58c7
  159191: 14beeff
  159183: 84ae0ba
  159167: cab4bc5
v: v3

Author: csherratt

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 40fb87d40f681f5356af42175fc7b85da387f037
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 4019118ec2f5fb1e6749e80b15fc70a9d0accd6f
+refs/heads/snap-stage3: 6277e3b2d9567a2f829862c713e78e4ac13bb600
 refs/heads/try: f58aad6dce273570fb130b4df008ef9acd5a5be2
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/libcollections/ring_buf.rs

@@ -22,7 +22,7 @@ use core::raw::Slice as RawSlice;
 use core::ptr;
 use core::kinds::marker;
 use core::mem;
-use core::num;
+use core::num::{Int, UnsignedInt};
 
 use std::hash::{Writer, Hash};
 use std::cmp;
@@ -115,8 +115,8 @@ impl<T> RingBuf<T> {
     #[unstable = "matches collection reform specification, waiting for dust to settle"]
     pub fn with_capacity(n: uint) -> RingBuf<T> {
         // +1 since the ringbuffer always leaves one space empty
-        let cap = num::next_power_of_two(cmp::max(n + 1, MINIMUM_CAPACITY));
-        let size = cap.checked_mul(&mem::size_of::<T>())
+        let cap = cmp::max(n + 1, MINIMUM_CAPACITY).next_power_of_two();
+        let size = cap.checked_mul(mem::size_of::<T>())
                       .expect("capacity overflow");
 
         let ptr = if mem::size_of::<T>() != 0 {
@@ -280,12 +280,12 @@ impl<T> RingBuf<T> {
         let new_len = self.len() + additional;
         assert!(new_len + 1 > self.len(), "capacity overflow");
         if new_len > self.capacity() {
-            let count = num::next_power_of_two(new_len + 1);
+            let count = (new_len + 1).next_power_of_two();
             assert!(count >= new_len + 1);
 
             if mem::size_of::<T>() != 0 {
                 let old = self.cap * mem::size_of::<T>();
-                let new = count.checked_mul(&mem::size_of::<T>())
+                let new = count.checked_mul(mem::size_of::<T>())
                                .expect("capacity overflow");
                 unsafe {
                     self.ptr = heap::reallocate(self.ptr as *mut u8,