---

yaml
---
r: 30459
b: refs/heads/incoming
c: f2d9d0b
h: refs/heads/master
i:
  30457: 60f58a7
  30455: 50b8997
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 93d3b8aa6b681a8add60e4a22a5c41e7f7ce7557
+refs/heads/incoming: f2d9d0ba41486924538b28511d60b713b6686f7b
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/extfmt.rs

@@ -88,35 +88,35 @@ mod ct {
         let lim = str::len(s);
         let mut buf = ~"";
         fn flush_buf(+buf: ~str, &pieces: ~[piece]) -> ~str {
-            if str::len(buf) > 0u {
-                let piece = piece_string(buf);
-                vec::push(pieces, piece);
+            if str::len(buf) > 0 {
+                let piece = piece_string(move buf);
+                vec::push(pieces, move piece);
             }
             return ~"";
         }
-        let mut i = 0u;
+        let mut i = 0;
         while i < lim {
             let size = str::utf8_char_width(s[i]);
             let curr = str::slice(s, i, i+size);
             if curr == ~"%" {
-                i += 1u;
+                i += 1;
                 if i >= lim {
                     error(~"unterminated conversion at end of string");
                 }
-                let curr2 = str::slice(s, i, i+1u);
+                let curr2 = str::slice(s, i, i+1);
                 if curr2 == ~"%" {
                     buf += curr2;
-                    i += 1u;
+                    i += 1;
                 } else {
-                    buf = flush_buf(buf, pieces);
+                    buf = flush_buf(move buf, pieces);
                     let rs = parse_conversion(s, i, lim, error);
                     vec::push(pieces, copy rs.piece);
                     i = rs.next;
                 }
             } else { buf += curr; i += size; }
         }
-        flush_buf(buf, pieces);
-        return pieces;
+        flush_buf(move buf, pieces);
+        move pieces
     }
     fn peek_num(s: ~str, i: uint, lim: uint) ->
        Option<{num: uint, next: uint}> {
@@ -173,7 +173,7 @@ mod ct {
     fn parse_flags(s: ~str, i: uint, lim: uint) ->
        {flags: ~[flag], next: uint} {
         let noflags: ~[flag] = ~[];
-        if i >= lim { return {flags: noflags, next: i}; }
+        if i >= lim { return {flags: move noflags, next: i}; }
 
         fn more_(f: flag, s: ~str, i: uint, lim: uint) ->
            {flags: ~[flag], next: uint} {
@@ -376,7 +376,7 @@ mod rt {
                     let diff = prec - len;
                     let pad = str::from_chars(vec::from_elem(diff, '0'));
                     pad + s
-                } else { s }
+                } else { move s }
             };
     }
     pure fn get_int_precision(cv: conv) -> uint {

branches/incoming/src/libcore/flate.rs

@@ -31,7 +31,7 @@ fn deflate_buf(buf: &[const u8]) -> ~[u8] {
             let out = vec::unsafe::from_buf(res as *u8,
                                             outsz as uint);
             libc::free(res);
-            out
+            move out
         }
     }
 }
@@ -49,7 +49,7 @@ fn inflate_buf(buf: &[const u8]) -> ~[u8] {
             let out = vec::unsafe::from_buf(res as *u8,
                                             outsz as uint);
             libc::free(res);
-            out
+            move out
         }
     }
 }

branches/incoming/src/libcore/io.rs

@@ -58,7 +58,7 @@ impl<T: Reader> T : ReaderUtil {
         let count = self.read(buf, len);
 
         unsafe { vec::unsafe::set_len(buf, count); }
-        vec::from_mut(buf)
+        vec::from_mut(move buf)
     }
     fn read_line() -> ~str {
         let mut buf = ~[];
@@ -128,7 +128,7 @@ impl Reader {
                 buf = vec::slice(buf, offset, vec::len(buf));
             }
         }
-        chars
+        move chars
     }
 
     fn read_char() -> char {
@@ -180,7 +180,7 @@ impl Reader {
     fn read_whole_stream() -> ~[u8] {
         let mut buf: ~[u8] = ~[];
         while !self.eof() { vec::push_all(buf, self.read_bytes(2048u)); }
-        buf
+        move buf
     }
 
     fn each_byte(it: fn(int) -> bool) {
@@ -688,7 +688,7 @@ impl MemBuffer: Writer {
 
             self.pos += v_len;
 
-            buf
+            move buf
         }
     }
     fn seek(offset: int, whence: SeekStyle) {

branches/incoming/src/libcore/os.rs

@@ -215,7 +215,7 @@ mod global_env {
                 assert vec::len(vs) == 2u;
                 vec::push(pairs, (copy vs[0], copy vs[1]));
             }
-            return pairs;
+            move pairs
         }
 
         #[cfg(unix)]

branches/incoming/src/libcore/path.rs

@@ -99,7 +99,7 @@ impl PosixPath : GenericPath {
             if s.len() == 0 {
                 ~"."
             } else {
-                s
+                move s
             }
         }
     }
@@ -139,7 +139,7 @@ impl PosixPath : GenericPath {
         let dpath = from_str::<PosixPath>(d);
         match self.filename() {
           Some(ref f) => dpath.push(*f),
-          None => dpath
+          None => move dpath
         }
     }
 
@@ -197,8 +197,7 @@ impl PosixPath : GenericPath {
     }
 
     pure fn push_many(cs: &[~str]) -> PosixPath {
-        return PosixPath { components: self.components + cs,
-                           ..self }
+       PosixPath { components: (copy self.components) + copy cs, ..self }
     }
 
     pure fn push(s: &str) -> PosixPath {
@@ -288,7 +287,7 @@ impl WindowsPath : GenericPath {
             if s.len() == 0 {
                 ~"."
             } else {
-                s
+                move s
             }
         }
     }
@@ -328,7 +327,7 @@ impl WindowsPath : GenericPath {
         let dpath = from_str::<WindowsPath>(d);
         match self.filename() {
           Some(ref f) => dpath.push(*f),
-          None => dpath
+          None => move dpath
         }
     }
 
@@ -386,7 +385,7 @@ impl WindowsPath : GenericPath {
     }
 
     pure fn push_many(cs: &[~str]) -> WindowsPath {
-        return WindowsPath { components: self.components + cs,
+        return WindowsPath { components: (copy self.components) + (copy cs),
                             ..self }
     }
 
@@ -428,7 +427,7 @@ pure fn normalize(components: &[~str]) -> ~[~str] {
             }
         }
     }
-    cs
+    move cs
 }
 
 mod posix {
@@ -525,7 +524,7 @@ mod windows {
                 if s[i] == '\\' as u8 {
                     let pre = s.slice(2, i);
                     let rest = s.slice(i, s.len());
-                    return Some((pre, rest));
+                    return Some((move pre, move rest));
                 }
                 i += 1;
             }
@@ -543,7 +542,7 @@ mod windows {
                 } else {
                     s.slice(2, s.len())
                 };
-                return Some((s.slice(0,1), rest));
+                return Some((s.slice(0,1), move rest));
             }
             None
         }

branches/incoming/src/libcore/priv.rs

@@ -46,15 +46,15 @@ unsafe fn chan_from_global_ptr<T: Send>(
         // There's no global channel. We must make it
 
         let (setup_po, setup_ch) = do task_fn().spawn_conversation
-            |setup_po, setup_ch| {
+            |move f, setup_po, setup_ch| {
             let po = comm::Port::<T>();
             let ch = comm::Chan(po);
             comm::send(setup_ch, ch);
 
             // Wait to hear if we are the official instance of
             // this global task
             match comm::recv::<Msg>(setup_po) {
-              Proceed => f(po),
+              Proceed => f(move po),
               Abort => ()
             }
         };

branches/incoming/src/libcore/rand.rs

@@ -154,7 +154,7 @@ impl Rng {
             s = s + str::from_char(self.gen_char_from(charset));
             i += 1u;
         }
-        s
+        move s
     }
 
     /// Return a random byte string of the specified length
@@ -220,14 +220,14 @@ impl Rng {
                 vec::push(r, item.item);
             }
         }
-        r
+        move r
     }
 
     /// Shuffle a vec
     fn shuffle<T:Copy>(values: &[T]) -> ~[T] {
         let mut m = vec::from_slice(values);
         self.shuffle_mut(m);
-        return m;
+        move m
     }
 
     /// Shuffle a mutable vec in place

branches/incoming/src/libcore/run.rs

@@ -260,7 +260,7 @@ fn read_all(rd: io::Reader) -> ~str {
         let bytes = rd.read_bytes(4096u);
         buf += str::from_bytes(bytes);
     }
-    return buf;
+    move buf
 }
 
 /**
@@ -306,11 +306,11 @@ fn program_output(prog: &str, args: &[~str]) ->
     let ch = comm::Chan(p);
     do task::spawn_sched(task::SingleThreaded) {
         let errput = readclose(pipe_err.in);
-        comm::send(ch, (2, errput));
+        comm::send(ch, (2, move errput));
     };
     do task::spawn_sched(task::SingleThreaded) {
         let output = readclose(pipe_out.in);
-        comm::send(ch, (1, output));
+        comm::send(ch, (1, move output));
     };
     let status = run::waitpid(pid);
     let mut errs = ~"";
@@ -332,7 +332,7 @@ fn program_output(prog: &str, args: &[~str]) ->
         };
         count -= 1;
     };
-    return {status: status, out: outs, err: errs};
+    return {status: status, out: move outs, err: move errs};
 }
 
 fn writeclose(fd: c_int, s: &str) {
@@ -354,7 +354,7 @@ fn readclose(fd: c_int) -> ~str {
         buf += str::from_bytes(bytes);
     }
     os::fclose(file);
-    return buf;
+    move buf
 }
 
 /// Waits for a process to exit and returns the exit code