---

yaml
---
r: 159196
b: refs/heads/snap-stage3
c: 4cae9ad
h: refs/heads/master
v: v3

Author: csherratt

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 40fb87d40f681f5356af42175fc7b85da387f037
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: ba24e3302102eb97c253ad8d0ad08a5678428ae5
+refs/heads/snap-stage3: 4cae9add8c9471126aa405cacecac2623232083a
 refs/heads/try: f58aad6dce273570fb130b4df008ef9acd5a5be2
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

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

@@ -209,7 +209,7 @@ impl<T> RingBuf<T> {
         assert!(i < self.len());
         assert!(j < self.len());
         let ri = wrap_index(self.tail + i, self.cap);
-        let rj = wrap_index(self.tail + j, self.cap);
+        let rj = wrap_index(self.tail + j, self.cap);;
         unsafe {
             ptr::swap(self.ptr.offset(ri as int), self.ptr.offset(rj as int))
         }
@@ -320,6 +320,7 @@ impl<T> RingBuf<T> {
                     );
                 }
                 self.head += oldcap;
+                debug_assert!(self.head > self.tail);
             } else { // C
                 unsafe {
                     ptr::copy_nonoverlapping_memory(
@@ -329,7 +330,10 @@ impl<T> RingBuf<T> {
                     );
                 }
                 self.tail = count - (oldcap - self.tail);
+                debug_assert!(self.head < self.tail);
             }
+            debug_assert!(self.head < self.cap);
+            debug_assert!(self.tail < self.cap);
         }
     }
 
@@ -564,7 +568,10 @@ impl<T> RingBuf<T> {
     /// ```
     #[unstable = "matches collection reform specification, waiting for dust to settle"]
     pub fn push_front(&mut self, t: T) {
-        if self.is_full() { self.reserve(1) }
+        if self.is_full() {
+            self.reserve(1);
+            debug_assert!(!self.is_full());
+        }
 
         self.tail = wrap_index(self.tail - 1, self.cap);
         let tail = self.tail;
@@ -591,7 +598,10 @@ impl<T> RingBuf<T> {
     /// ```
     #[unstable = "matches collection reform specification, waiting for dust to settle"]
     pub fn push_back(&mut self, t: T) {
-        if self.is_full() { self.reserve(1) }
+        if self.is_full() {
+            self.reserve(1);
+            debug_assert!(!self.is_full());
+        }
 
         let head = self.head;
         self.head = wrap_index(self.head + 1, self.cap);
@@ -634,7 +644,9 @@ impl<T> RingBuf<T> {
 #[inline]
 fn wrap_index(index: uint, size: uint) -> uint {
     // size is always a power of 2
-    index & (size - 1)
+    let idx = index & (size - 1);
+    debug_assert!(idx < size);
+    idx
 }
 
 /// Calculate the number of elements left to be read in the buffer