---

yaml
---
r: 39660
b: refs/heads/incoming
c: 8ffc2b0
h: refs/heads/master
v: v3

Author: thestinger

[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: af48f305421ae40bdcc8df7af168f8cfefc9bb86
+refs/heads/incoming: 8ffc2b0f5e4b05472578797a569090ea04052593
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/AUTHORS.txt

@@ -108,7 +108,6 @@ Patrik Kårlin <[email protected]>
 Paul Stansifer <[email protected]>
 Paul Woolcock <[email protected]>
 Peter Hull <[email protected]>
-Peter Williams <[email protected]>
 Philipp Brüschweiler <[email protected]>
 Rafael Ávila de Espíndola <[email protected]>
 Ralph Giles <[email protected]>

branches/incoming/src/etc/sugarise-doc-comments.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 #
 # this script attempts to turn doc comment attributes (#[doc = "..."])

branches/incoming/src/libcore/ops.rs

@@ -15,7 +15,7 @@
 
 #[lang="drop"]
 pub trait Drop {
-    fn finalize(&self);  // FIXME(#4332): Rename to "drop"? --pcwalton
+    fn finalize(&self);  // XXX: Rename to "drop"? --pcwalton
 }
 
 #[lang="add"]

branches/incoming/src/libstd/sha1.rs

@@ -37,9 +37,9 @@ use core::vec;
 /// The SHA-1 interface
 trait Sha1 {
     /// Provide message input as bytes
-    fn input(&[const u8]);
+    fn input((&[u8]));
     /// Provide message input as string
-    fn input_str(&str);
+    fn input_str((&str));
     /**
      * Read the digest as a vector of 20 bytes. After calling this no further
      * input may be provided until reset is called.
@@ -75,9 +75,9 @@ pub fn sha1() -> Sha1 {
          mut computed: bool,
          work_buf: @~[mut u32]};
 
-    fn add_input(st: &Sha1State, msg: &[const u8]) {
+    fn add_input(st: &Sha1State, msg: &[u8]) {
         assert (!st.computed);
-        for vec::each_const(msg) |element| {
+        for vec::each(msg) |element| {
             st.msg_block[st.msg_block_idx] = *element;
             st.msg_block_idx += 1u;
             st.len_low += 8u32;
@@ -243,7 +243,7 @@ pub fn sha1() -> Sha1 {
             self.h[4] = 0xC3D2E1F0u32;
             self.computed = false;
         }
-        fn input(msg: &[const u8]) { add_input(&self, msg); }
+        fn input(msg: &[u8]) { add_input(&self, msg); }
         fn input_str(msg: &str) {
             let bs = str::to_bytes(msg);
             add_input(&self, bs);

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

@@ -83,7 +83,7 @@ fn fillbyte(x: cmplx, incr: f64) -> u8 {
     rv
 }
 
-fn chanmb(i: uint, size: uint) -> Line
+fn chanmb(i: uint, size: uint, ch: oldcomm::Chan<Line>) -> ()
 {
     let mut crv = ~[];
     let incr = 2f64/(size as f64);
@@ -93,24 +93,27 @@ fn chanmb(i: uint, size: uint) -> Line
         let x = cmplx {re: xincr*(j as f64) - 1.5f64, im: y};
         crv.push(fillbyte(x, incr));
     };
-    Line {i:i, b:crv}
+    oldcomm::send(ch, Line {i:i, b: move crv});
 }
 
-struct Devnull();
+type devnull = {dn: int};
 
-impl Devnull: io::Writer {
+impl devnull: io::Writer {
     fn write(&self, _b: &[const u8]) {}
     fn seek(&self, _i: int, _s: io::SeekStyle) {}
     fn tell(&self) -> uint {0_u}
     fn flush(&self) -> int {0}
     fn get_type(&self) -> io::WriterType { io::File }
 }
 
-fn writer(path: ~str, pport: pipes::Port<Line>, size: uint)
+fn writer(path: ~str, writech: oldcomm::Chan<oldcomm::Chan<Line>>, size: uint)
 {
+    let p: oldcomm::Port<Line> = oldcomm::Port();
+    let ch = oldcomm::Chan(&p);
+    oldcomm::send(writech, ch);
     let cout: io::Writer = match path {
         ~"" => {
-            Devnull as io::Writer
+            {dn: 0} as io::Writer
         }
         ~"-" => {
             io::stdout()
@@ -127,7 +130,7 @@ fn writer(path: ~str, pport: pipes::Port<Line>, size: uint)
     let mut done = 0_u;
     let mut i = 0_u;
     while i < size {
-        let aline = pport.recv();
+        let aline = oldcomm::recv(p);
         if aline.i == done {
             debug!("W %u", aline.i);
             cout.write(aline.b);
@@ -168,11 +171,13 @@ fn main() {
     let size = if vec::len(args) < 2_u { 80_u }
     else { uint::from_str(args[1]).get() };
 
-    let (pport, pchan) = pipes::stream();
-    let pchan = pipes::SharedChan(pchan);
+    let writep = oldcomm::Port();
+    let writech = oldcomm::Chan(&writep);
+    do task::spawn |move path| {
+        writer(copy path, writech, size);
+    };
+    let ch = oldcomm::recv(writep);
     for uint::range(0_u, size) |j| {
-        let cchan = pchan.clone();
-        do task::spawn |move cchan| { cchan.send(chanmb(j, size)) };
+        do task::spawn { chanmb(j, size, ch) };
     };
-    writer(path, pport, size);
 }