---

yaml
---
r: 33371
b: refs/heads/snap-stage3
c: d9f1426
h: refs/heads/master
i:
  33369: 21410cb
  33367: 7a1d0d1
v: v3

Author: catamorphism

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: cf8bded7aae0673f9275de7948508da3c2b58650
+refs/heads/snap-stage3: d9f1426e69410f0eda9b4c1b2e87042a8bbda41d
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/str.rs

@@ -207,7 +207,7 @@ pub pure fn connect(v: &[~str], sep: &str) -> ~str {
 pub fn repeat(ss: &str, nn: uint) -> ~str {
     let mut acc = ~"";
     for nn.times { acc += ss; }
-    return acc;
+    move acc
 }
 
 /*
@@ -593,23 +593,23 @@ pub fn split_within(ss: &str, lim: uint) -> ~[~str] {
     let mut row  : ~str    = ~"";
 
     for words.each |wptr| {
-        let word = *wptr;
+        let word = copy *wptr;
 
         // if adding this word to the row would go over the limit,
         // then start a new row
-        if str::len(row) + str::len(word) + 1 > lim {
-            rows += [row]; // save previous row
-            row = word;    // start a new one
+        if row.len() + word.len() + 1 > lim {
+            rows.push(copy row); // save previous row
+            row = move word;    // start a new one
         } else {
-            if str::len(row) > 0 { row += ~" " } // separate words
+            if row.len() > 0 { row += ~" " } // separate words
             row += word;  // append to this row
         }
     }
 
     // save the last row
-    if row != ~"" { rows += [row]; }
+    if row != ~"" { rows.push(move row); }
 
-    return rows;
+    move rows
 }