---

yaml
---
r: 126750
b: refs/heads/snap-stage3
c: 94e42c2
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 7be8f0af0393dcdb077c2f6b1653836fd3fba235
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 2d79bfa4150c356240d934b14623d6e90f7e48c4
+refs/heads/snap-stage3: 94e42c2d896cd26c1a48fa4a1748f2c62089fc2a
 refs/heads/try: 502e4c045236682e9728539dc0d2b3d0b237f55c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -249,29 +249,17 @@ impl<T> Deque<T> for DList<T> {
     fn pop_front(&mut self) -> Option<T> {
         self.pop_front_node().map(|box Node{value, ..}| value)
     }
+}
 
-    /// Add an element last in the list
-    ///
-    /// O(1)
-    #[deprecated = "use the `push` method"]
-    fn push_back(&mut self, elt: T) {
+impl<T> MutableSeq<T> for DList<T> {
+    fn push(&mut self, elt: T) {
         self.push_back_node(box Node::new(elt))
     }
-
-    /// Remove the last element and return it, or None if the list is empty
-    ///
-    /// O(1)
-    #[deprecated = "use the `pop` method"]
-    fn pop_back(&mut self) -> Option<T> {
+    fn pop(&mut self) -> Option<T> {
         self.pop_back_node().map(|box Node{value, ..}| value)
     }
 }
 
-impl<T> MutableSeq<T> for DList<T> {
-    fn push(&mut self, elt: T) { self.push_back(elt) }
-    fn pop(&mut self) -> Option<T> { self.pop_back() }
-}
-
 impl<T> Default for DList<T> {
     #[inline]
     fn default() -> DList<T> { DList::new() }

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

@@ -516,7 +516,7 @@ pub trait Deque<T> : MutableSeq<T> {
     /// assert_eq!(d.front(), Some(&1i));
     /// ```
     #[deprecated = "use the `push` method"]
-    fn push_back(&mut self, elt: T);
+    fn push_back(&mut self, elt: T) { self.push(elt) }
 
     /// Remove the last element and return it, or `None` if the sequence is empty.
     ///
@@ -534,7 +534,7 @@ pub trait Deque<T> : MutableSeq<T> {
     /// assert_eq!(d.pop_back(), None);
     /// ```
     #[deprecated = "use the `pop` method"]
-    fn pop_back(&mut self) -> Option<T>;
+    fn pop_back(&mut self) -> Option<T> { self.pop() }
 
     /// Remove the first element and return it, or `None` if the sequence is empty.
     ///

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

@@ -80,18 +80,6 @@ impl<T> Deque<T> for RingBuf<T> {
         result
     }
 
-    /// Remove and return the last element in the RingBuf, or None if it is empty
-    #[deprecated = "use the `pop` method"]
-    fn pop_back(&mut self) -> Option<T> {
-        if self.nelts > 0 {
-            self.nelts -= 1;
-            let hi = self.raw_index(self.nelts);
-            self.elts.get_mut(hi).take()
-        } else {
-            None
-        }
-    }
-
     /// Prepend an element to the RingBuf
     fn push_front(&mut self, t: T) {
         if self.nelts == self.elts.len() {
@@ -103,22 +91,26 @@ impl<T> Deque<T> for RingBuf<T> {
         *self.elts.get_mut(self.lo) = Some(t);
         self.nelts += 1u;
     }
+}
 
-    /// Append an element to the RingBuf
-    #[deprecated = "use the `push` method"]
-    fn push_back(&mut self, t: T) {
+impl<T> MutableSeq<T> for RingBuf<T> {
+    fn push(&mut self, t: T) {
         if self.nelts == self.elts.len() {
             grow(self.nelts, &mut self.lo, &mut self.elts);
         }
         let hi = self.raw_index(self.nelts);
         *self.elts.get_mut(hi) = Some(t);
         self.nelts += 1u;
     }
-}
-
-impl<T> MutableSeq<T> for RingBuf<T> {
-    fn push(&mut self, t: T) { self.push_back(t) }
-    fn pop(&mut self) -> Option<T> { self.pop_back() }
+    fn pop(&mut self) -> Option<T> {
+        if self.nelts > 0 {
+            self.nelts -= 1;
+            let hi = self.raw_index(self.nelts);
+            self.elts.get_mut(hi).take()
+        } else {
+            None
+        }
+    }
 }
 
 impl<T> Default for RingBuf<T> {