---

yaml
---
r: 44123
b: refs/heads/snap-stage3
c: 6190661
h: refs/heads/master
i:
  44121: ec57c28
  44119: dc5f4cf
v: v3

Author: thestinger

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 373c072e838dd663b2b164bcb6585d3c2bef0357
+refs/heads/snap-stage3: 6190661018b7a62613b7f02d2bc1c1d31cd2470d
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/deque.rs

@@ -45,6 +45,23 @@ impl<T> Deque<T> {
 
     fn peek_front(&self) -> &self/T { get(self.elts, self.lo) }
     fn peek_back(&self) -> &self/T { get(self.elts, self.hi - 1u) }
+
+    fn pop_front(&mut self) -> T {
+        let mut result = self.elts[self.lo].swap_unwrap();
+        self.lo = (self.lo + 1u) % self.elts.len();
+        self.nelts -= 1u;
+        result
+    }
+
+    fn pop_back(&mut self) -> T {
+        if self.hi == 0u {
+            self.hi = self.elts.len() - 1u;
+        } else { self.hi -= 1u; }
+        let mut result = self.elts[self.hi].swap_unwrap();
+        self.elts[self.hi] = None;
+        self.nelts -= 1u;
+        result
+    }
 }
 
 impl<T: Copy> Deque<T> {
@@ -73,24 +90,6 @@ impl<T: Copy> Deque<T> {
         self.nelts += 1u;
     }
 
-    fn pop_front(&mut self) -> T {
-        let t = { *get(self.elts, self.lo) };
-        self.elts[self.lo] = None;
-        self.lo = (self.lo + 1u) % self.elts.len();
-        self.nelts -= 1u;
-        t
-    }
-
-    fn pop_back(&mut self) -> T {
-        if self.hi == 0u {
-            self.hi = self.elts.len() - 1u;
-        } else { self.hi -= 1u; }
-        let t = { *get(self.elts, self.hi) };
-        self.elts[self.hi] = None;
-        self.nelts -= 1u;
-        t
-    }
-
     fn get(&self, i: int) -> T {
         let idx = (self.lo + (i as uint)) % self.elts.len();
         *get(self.elts, idx)