---

yaml
---
r: 44121
b: refs/heads/snap-stage3
c: 5929f15
h: refs/heads/master
i:
  44119: dc5f4cf
v: v3

Author: thestinger

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 5832fe968f08435be86cf6b900ac792445f3100d
+refs/heads/snap-stage3: 5929f159999b1d9712b8c1dd9fe92ce28c64a741
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -71,7 +71,7 @@ impl<T: Copy> Deque<T> {
     }
 
     fn pop_front(&mut self) -> T {
-        let t: T = get(self.elts, self.lo);
+        let t = { *get(self.elts, self.lo) };
         self.elts[self.lo] = None;
         self.lo = (self.lo + 1u) % self.elts.len();
         self.nelts -= 1u;
@@ -82,19 +82,19 @@ impl<T: Copy> Deque<T> {
         if self.hi == 0u {
             self.hi = self.elts.len() - 1u;
         } else { self.hi -= 1u; }
-        let t: T = get(self.elts, self.hi);
+        let t = { *get(self.elts, self.hi) };
         self.elts[self.hi] = None;
         self.nelts -= 1u;
         t
     }
 
-    fn peek_front(&self) -> T { get(self.elts, self.lo) }
+    fn peek_front(&self) -> T { *get(self.elts, self.lo) }
 
-    fn peek_back(&self) -> T { get(self.elts, self.hi - 1u) }
+    fn peek_back(&self) -> T { *get(self.elts, self.hi - 1u) }
 
     fn get(&self, i: int) -> T {
         let idx = (self.lo + (i as uint)) % self.elts.len();
-        get(self.elts, idx)
+        *get(self.elts, idx)
     }
 }
 
@@ -116,8 +116,8 @@ fn grow<T: Copy>(nelts: uint, lo: uint, elts: &[Option<T>]) -> ~[Option<T>] {
     rv
 }
 
-fn get<T: Copy>(elts: &[Option<T>], i: uint) -> T {
-    match elts[i] { Some(t) => t, _ => fail!() }
+fn get<T>(elts: &r/[Option<T>], i: uint) -> &r/T {
+    match elts[i] { Some(ref t) => t, _ => fail!() }
 }
 
 #[cfg(test)]