---

yaml
---
r: 39662
b: refs/heads/incoming
c: d91b2d4
h: refs/heads/master
v: v3

Author: catamorphism

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

branches/incoming/AUTHORS.txt

@@ -108,6 +108,7 @@ 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/mk/docs.mk

@@ -152,7 +152,7 @@ else
 
 doc/rust.g: rust.md $(S)src/etc/extract_grammar.py
 	@$(call E, extract_grammar: $@)
-	$(Q)$(CFG_PYTHON) $(S)src/etc/extract_grammar.py $< >$@
+	$(Q)$(S)src/etc/extract_grammar.py $< >$@
 
 verify-grammar: doc/rust.g
 	@$(call E, LLnextgen: $<)

branches/incoming/mk/snap.mk

@@ -14,10 +14,10 @@ define DEF_SNAP_FOR_STAGE_H
 
 ifdef CFG_INSTALL_SNAP
 snap-stage$(1)-H-$(2): $$(HSREQ$(1)_H_$(2))
-	$(CFG_PYTHON) $(S)src/etc/make-snapshot.py stage$(1) $(2) install
+	$(S)src/etc/make-snapshot.py stage$(1) $(2) install
 else
 snap-stage$(1)-H-$(2): $$(HSREQ$(1)_H_$(2))
-	$(CFG_PYTHON) $(S)src/etc/make-snapshot.py stage$(1) $(2)
+	$(S)src/etc/make-snapshot.py stage$(1) $(2)
 endif
 
 endef
@@ -30,4 +30,4 @@ snap-stage1: snap-stage1-H-$(CFG_HOST_TRIPLE)
 
 snap-stage2: snap-stage2-H-$(CFG_HOST_TRIPLE)
 
-snap-stage3: snap-stage3-H-$(CFG_HOST_TRIPLE)
+snap-stage3: snap-stage3-H-$(CFG_HOST_TRIPLE)

branches/incoming/mk/stage0.mk

@@ -11,7 +11,7 @@ $(HBIN0_H_$(CFG_HOST_TRIPLE))/rustc$(X):		\
 ifdef CFG_ENABLE_LOCAL_RUST
 	$(Q)$(S)src/etc/local_stage0.sh $(CFG_HOST_TRIPLE) $(CFG_LOCAL_RUST_ROOT)
 else 
-	$(Q)$(CFG_PYTHON) $(S)src/etc/get-snapshot.py $(CFG_HOST_TRIPLE) $(SNAPSHOT_FILE)
+	$(Q)$(S)src/etc/get-snapshot.py $(CFG_HOST_TRIPLE) $(SNAPSHOT_FILE)
 ifdef CFG_ENABLE_PAX_FLAGS
 	@$(call E, apply PaX flags: $@)
 	@"$(CFG_PAXCTL)" -cm "$@"

branches/incoming/mk/tests.mk

@@ -701,7 +701,7 @@ tmp/$(FT).rc tmp/$(FT_DRIVER).rs: \
 		$(RPASS_TESTS) \
 		$(S)src/etc/combine-tests.py
 	@$(call E, check: building combined stage2 test runner)
-	$(Q)$(CFG_PYTHON) $(S)src/etc/combine-tests.py
+	$(Q)$(S)src/etc/combine-tests.py
 
 define DEF_CHECK_FAST_FOR_T_H
 # $(1) unused

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/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);  // XXX: Rename to "drop"? --pcwalton
+    fn finalize(&self);  // FIXME(#4332): Rename to "drop"? --pcwalton
 }
 
 #[lang="add"]

branches/incoming/src/librustdoc/markdown_pass.rs

@@ -235,7 +235,7 @@ pub fn header_kind(+doc: doc::ItemTag) -> ~str {
         ~"Enum"
       }
       doc::TraitTag(_) => {
-        ~"Interface"
+        ~"Trait"
       }
       doc::ImplTag(_) => {
         ~"Implementation"
@@ -724,7 +724,7 @@ fn write_method(ctxt: &Ctxt, +doc: doc::MethodDoc) {
 #[test]
 fn should_write_trait_header() {
     let markdown = test::render(~"trait i { fn a(); }");
-    assert str::contains(markdown, ~"## Interface `i`");
+    assert str::contains(markdown, ~"## Trait `i`");
 }
 
 #[test]

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((&[u8]));
+    fn input(&[const 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: &[u8]) {
+    fn add_input(st: &Sha1State, msg: &[const u8]) {
         assert (!st.computed);
-        for vec::each(msg) |element| {
+        for vec::each_const(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: &[u8]) { add_input(&self, msg); }
+        fn input(msg: &[const 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, ch: oldcomm::Chan<Line>) -> ()
+fn chanmb(i: uint, size: uint) -> Line
 {
     let mut crv = ~[];
     let incr = 2f64/(size as f64);
@@ -93,27 +93,24 @@ 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});
+    Line {i:i, b:crv}
 }
 
-type devnull = {dn: int};
+struct Devnull();
 
-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, writech: oldcomm::Chan<oldcomm::Chan<Line>>, size: uint)
+fn writer(path: ~str, pport: pipes::Port<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 {
         ~"" => {
-            {dn: 0} as io::Writer
+            Devnull as io::Writer
         }
         ~"-" => {
             io::stdout()
@@ -130,7 +127,7 @@ fn writer(path: ~str, writech: oldcomm::Chan<oldcomm::Chan<Line>>, size: uint)
     let mut done = 0_u;
     let mut i = 0_u;
     while i < size {
-        let aline = oldcomm::recv(p);
+        let aline = pport.recv();
         if aline.i == done {
             debug!("W %u", aline.i);
             cout.write(aline.b);
@@ -171,13 +168,11 @@ fn main() {
     let size = if vec::len(args) < 2_u { 80_u }
     else { uint::from_str(args[1]).get() };
 
-    let writep = oldcomm::Port();
-    let writech = oldcomm::Chan(&writep);
-    do task::spawn |move path| {
-        writer(copy path, writech, size);
-    };
-    let ch = oldcomm::recv(writep);
+    let (pport, pchan) = pipes::stream();
+    let pchan = pipes::SharedChan(pchan);
     for uint::range(0_u, size) |j| {
-        do task::spawn { chanmb(j, size, ch) };
+        let cchan = pchan.clone();
+        do task::spawn |move cchan| { cchan.send(chanmb(j, size)) };
     };
+    writer(path, pport, size);
 }