---

yaml
---
r: 46335
b: refs/heads/auto
c: 5aa0463
h: refs/heads/master
i:
  46333: 3bdfebf
  46331: daeae5d
  46327: a840378
  46319: 9aa88ac
  46303: d73fc8c
  46271: da6767a
  46207: c30b96a
  46079: 657bed8
v: v3

Author: thestinger

[refs]

@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: a2573290710f4b3f14be475f4ef2af773de7b4c7
+refs/heads/auto: 5aa04635647287481ceca44cf557b698666fa939

branches/auto/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