---

yaml
---
r: 42961
b: refs/heads/try
c: e22aa02
h: refs/heads/master
i:
  42959: b70071c
v: v3

Author: catamorphism

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 8dfab498ef21d332a50c36059db7eacabb58cbcb
+refs/heads/try: e22aa029fb4d923dc03748b435abd6330933b473
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libcore/pipes.rs

@@ -143,14 +143,9 @@ pub fn BufferHeader() -> BufferHeader {
 // This is for protocols to associate extra data to thread around.
 #[doc(hidden)]
 #[cfg(stage0)]
-type Buffer<T: Owned> = {
-    header: BufferHeader,
-    data: T,
-};
-#[doc(hidden)]
 #[cfg(stage1)]
+type Buffer<T> = { header: BufferHeader, data: T };
 #[cfg(stage2)]
-#[cfg(stage3)]
 pub struct Buffer<T> {
     header: BufferHeader,
     data: T,
@@ -247,7 +242,6 @@ pub fn mk_packet<T: Owned>() -> Packet<T> {
         payload: None,
     }
 }
-
 #[doc(hidden)]
 #[cfg(stage0)]
 fn unibuffer<T: Owned>() -> ~Buffer<Packet<T>> {
@@ -264,10 +258,23 @@ fn unibuffer<T: Owned>() -> ~Buffer<Packet<T>> {
     }
     move b
 }
-#[doc(hidden)]
 #[cfg(stage1)]
+fn unibuffer<T>() -> ~Buffer<Packet<T>> {
+    let b = ~{
+        header: BufferHeader(),
+        data: Packet {
+            header: PacketHeader(),
+            payload: None,
+        }
+    };
+
+    unsafe {
+        b.data.header.buffer = reinterpret_cast(&b);
+    }
+    move b
+}
+#[doc(hidden)]
 #[cfg(stage2)]
-#[cfg(stage3)]
 fn unibuffer<T>() -> ~Buffer<Packet<T>> {
     let b = ~Buffer {
         header: BufferHeader(),

branches/try/src/libcore/private.rs

@@ -486,7 +486,7 @@ pub mod tests {
         res.recv();
     }
 
-    #[test] #[should_fail] #[ignore(reason = "random red")]
+    #[test] #[should_fail] #[ignore(cfg(windows))]
     pub fn exclusive_unwrap_conflict() {
         let x = exclusive(~~"hello");
         let x2 = ~mut Some(x.clone());

branches/try/src/libsyntax/ext/pipes/pipec.rs

@@ -355,6 +355,34 @@ pub impl protocol: gen_init {
         }))
     }
 
+    #[cfg(stage0)]
+    fn gen_init_bounded(ext_cx: ext_ctxt) -> @ast::expr {
+        debug!("gen_init_bounded");
+        let buffer_fields = self.gen_buffer_init(ext_cx);
+        let buffer = quote_expr!(~{
+            header: ::pipes::BufferHeader(),
+            data: $buffer_fields,
+        });
+
+        let entangle_body = ext_cx.block_expr(
+            ext_cx.block(
+                self.states.map_to_vec(
+                    |s| ext_cx.parse_stmt(
+                        fmt!("data.%s.set_buffer_(buffer)",
+                             s.name))),
+                ext_cx.parse_expr(
+                    fmt!("::ptr::addr_of(&(data.%s))",
+                         self.states[0].name))));
+
+        quote_expr!({
+            let buffer = $buffer;
+            do ::pipes::entangle_buffer(move buffer) |buffer, data| {
+                $entangle_body
+            }
+        })
+    }
+    #[cfg(stage1)]
+    #[cfg(stage2)]
     fn gen_init_bounded(ext_cx: ext_ctxt) -> @ast::expr {
         debug!("gen_init_bounded");
         let buffer_fields = self.gen_buffer_init(ext_cx);