---

yaml
---
r: 39555
b: refs/heads/incoming
c: 0100b02
h: refs/heads/master
i:
  39553: 4c0ef24
  39551: e179219
v: v3

Author: ejholmes

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 2452ee11abd1aab42adbf4e8e6455dd74e2a5aa9
+refs/heads/incoming: 0100b02b3aade7f476c543957df1dbcee0d0b52f
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial-ffi.md

@@ -22,7 +22,7 @@ extern mod crypto {
 
 fn as_hex(data: ~[u8]) -> ~str {
     let mut acc = ~"";
-    for data.each |byte| { acc += fmt!("%02x", byte as uint); }
+    for data.each |&byte| { acc += fmt!("%02x", byte as uint); }
     return acc;
 }
 
@@ -33,8 +33,8 @@ fn sha1(data: ~str) -> ~str unsafe {
     return as_hex(vec::from_buf(hash, 20));
 }
 
-fn main(args: ~[~str]) {
-    io::println(sha1(args[1]));
+fn main() {
+    io::println(sha1(core::os::args()[1]));
 }
 ~~~~
 

branches/incoming/src/test/bench/shootout-mandelbrot.rs

@@ -12,14 +12,18 @@
 //  http://shootout.alioth.debian.org/
 //   u64q/program.php?test=mandelbrot&lang=python3&id=2
 //
-//  takes 2 optional args:
+//  takes 3 optional args:
 //   square image size, defaults to 80_u
+//   yield frequency, defaults to 10_u (yield every 10 spawns)
 //   output path, default is "" (no output), "-" means stdout
 //
 //  in the shootout, they use 16000 as image size
+//  yield frequency doesn't seem to have much effect
 //
 //  writes pbm image to output path
 
+#[legacy_modes];
+
 extern mod std;
 use io::WriterUtil;
 use std::map::HashMap;
@@ -47,7 +51,7 @@ impl cmplx : ops::Add<cmplx,cmplx> {
     }
 }
 
-struct Line {i: uint, b: ~[u8]}
+type line = {i: uint, b: ~[u8]};
 
 pure fn cabs(x: cmplx) -> f64
 {
@@ -83,7 +87,7 @@ fn fillbyte(x: cmplx, incr: f64) -> u8 {
     rv
 }
 
-fn chanmb(i: uint, size: uint, ch: oldcomm::Chan<Line>) -> ()
+fn chanmb(i: uint, size: uint, ch: oldcomm::Chan<line>) -> ()
 {
     let mut crv = ~[];
     let incr = 2f64/(size as f64);
@@ -93,22 +97,22 @@ fn chanmb(i: uint, size: uint, ch: oldcomm::Chan<Line>) -> ()
         let x = cmplx {re: xincr*(j as f64) - 1.5f64, im: y};
         crv.push(fillbyte(x, incr));
     };
-    oldcomm::send(ch, Line {i:i, b: move crv});
+    oldcomm::send(ch, {i:i, b:crv});
 }
 
 type devnull = {dn: int};
 
 impl devnull: io::Writer {
     fn write(_b: &[const u8]) {}
-    fn seek(_i: int, _s: io::SeekStyle) {}
+    fn seek(+_i: int, +_s: io::SeekStyle) {}
     fn tell() -> uint {0_u}
     fn flush() -> int {0}
     fn get_type() -> io::WriterType { io::File }
 }
 
-fn writer(path: ~str, writech: oldcomm::Chan<oldcomm::Chan<Line>>, size: uint)
+fn writer(path: ~str, writech: oldcomm::Chan<oldcomm::Chan<line>>, size: uint)
 {
-    let p: oldcomm::Port<Line> = oldcomm::Port();
+    let p: oldcomm::Port<line> = oldcomm::Port();
     let ch = oldcomm::Chan(&p);
     oldcomm::send(writech, ch);
     let cout: io::Writer = match path {
@@ -160,13 +164,16 @@ fn writer(path: ~str, writech: oldcomm::Chan<oldcomm::Chan<Line>>, size: uint)
 fn main() {
     let args = os::args();
     let args = if os::getenv(~"RUST_BENCH").is_some() {
-        ~[~"", ~"4000"]
+        ~[~"", ~"4000", ~"10"]
     } else {
         args
     };
 
-    let path = if vec::len(args) < 3_u { ~"" }
-    else { copy args[2] };  // FIXME: bad for perf
+    let path = if vec::len(args) < 4_u { ~"" }
+    else { copy args[3] };  // FIXME: bad for perf
+
+    let yieldevery = if vec::len(args) < 3_u { 10_u }
+    else { uint::from_str(args[2]).get() };
 
     let size = if vec::len(args) < 2_u { 80_u }
     else { uint::from_str(args[1]).get() };
@@ -178,6 +185,10 @@ fn main() {
     };
     let ch = oldcomm::recv(writep);
     for uint::range(0_u, size) |j| {
-        do task::spawn { chanmb(j, size, ch) };
+        task::spawn(|| chanmb(j, size, ch) );
+        if j % yieldevery == 0_u {
+            debug!("Y %u", j);
+            task::yield();
+        };
     };
 }

branches/incoming/src/test/run-pass/issue-3250.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-fast - ICE
 trait Foo {
     fn foo();
 }