---

yaml
---
r: 29862
b: refs/heads/incoming
c: 913f7bd
h: refs/heads/master
v: v3

Author: brson

[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: e1b11aaf4b44152317e1607a959100c12bf24c54
+refs/heads/incoming: 913f7bdae744f88110eaca73fb28e4b8e987456c
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/pipes.rs

@@ -97,6 +97,9 @@ export stream, port, chan, shared_chan, port_set, channel;
 export oneshot, chan_one, port_one;
 export recv_one, try_recv_one, send_one, try_send_one;
 
+// Functions used by the protocol compiler
+export rt;
+
 #[doc(hidden)]
 const SPIN_COUNT: uint = 0;
 
@@ -1194,6 +1197,13 @@ fn try_send_one<T: send>(+chan: chan_one<T>, +data: T)
     oneshot::client::try_send(chan, data).is_some()
 }
 
+mod rt {
+    // These are used to hide the option constructors from the
+    // compiler because their names are changing
+    fn make_some<T>(+val: T) -> option<T> { some(val) }
+    fn make_none<T>() -> option<T> { none }
+}
+
 #[cfg(test)]
 mod test {
     #[test]

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

@@ -104,8 +104,8 @@ impl message: gen_send {
             }
             else {
                 body += fmt!("if pipes::send(pipe, message) {\n \
-                                  some(c) \
-                              } else { none } }");
+                                  pipes::rt::make_some(c) \
+                              } else { pipes::rt::make_none() } }");
             }
 
             let body = cx.parse_expr(body);
@@ -163,8 +163,8 @@ impl message: gen_send {
                     body += ~" }";
                 } else {
                     body += fmt!("if pipes::send(pipe, message) { \
-                                      some(()) \
-                                  } else { none } }");
+                                      pipes::rt::make_some(()) \
+                                  } else { pipes::rt::make_none() } }");
                 }
 
                 let body = cx.parse_expr(body);