---

yaml
---
r: 46091
b: refs/heads/try2
c: 5aa0463
h: refs/heads/master
i:
  46089: bee9814
  46087: 04cac8a
v: v3

Author: thestinger

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a2573290710f4b3f14be475f4ef2af773de7b4c7
+refs/heads/try2: 5aa04635647287481ceca44cf557b698666fa939
 refs/heads/incoming: 210fa2d0172c10112196e8fcf640e32ee54944fe
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libstd/deque.rs

@@ -98,17 +98,14 @@ impl<T: Copy> Deque<T> {
 
 /// Grow is only called on full elts, so nelts is also len(elts), unlike
 /// elsewhere.
-fn grow<T: Copy>(nelts: uint, lo: uint, elts: &[Option<T>]) -> ~[Option<T>] {
+fn grow<T>(nelts: uint, lo: uint, elts: &mut [Option<T>]) -> ~[Option<T>] {
     assert nelts == elts.len();
     let mut rv = ~[];
 
-    let mut i = 0u;
-    let nalloc = uint::next_power_of_two(nelts + 1u);
-    while i < nalloc {
-        if i < nelts {
-            rv.push(elts[(lo + i) % nelts]);
-        } else { rv.push(None); }
-        i += 1u;
+    do vec::grow_fn(&mut rv, nelts + 1) |i| {
+        let mut element = None;
+        element <-> elts[(lo + i) % nelts];
+        element
     }
 
     rv