---

brson · brson · commit 3f5b292892be · 2012-08-15T15:09:39.000-07:00
yaml --- r: 29854 b: refs/heads/incoming c: fd0f616 h: refs/heads/master v: v3
diff --git a/[refs] b/[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: c0140f5c344a206b4147d03d306bd6c83468d30b
+refs/heads/incoming: fd0f616ceb17ac283717322674e35b7589a27232
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libsyntax/ext/pipes/pipec.rs b/branches/incoming/src/libsyntax/ext/pipes/pipec.rs
@@ -361,7 +361,7 @@ impl protocol: gen_init {
             }
         }
 
-        cx.ty_path_ast_builder(path(@~"buffer", self.span)
+        cx.ty_path_ast_builder(path(@~"__Buffer", self.span)
                                .add_tys(cx.ty_vars(params)))
     }
 
@@ -383,7 +383,7 @@ impl protocol: gen_init {
         };
 
         cx.item_ty_poly(
-            @~"buffer",
+            @~"__Buffer",
             cx.ty_rec(fields),
             params)
     }

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ impl protocol: gen_init {`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`
`364`		`- cx.ty_path_ast_builder(path(@~"buffer", self.span)`
	`364`	`+ cx.ty_path_ast_builder(path(@~"__Buffer", self.span)`
`365`	`365`	`.add_tys(cx.ty_vars(params)))`
`366`	`366`	`}`
`367`	`367`
`@@ -383,7 +383,7 @@ impl protocol: gen_init {`
`383`	`383`	`};`
`384`	`384`
`385`	`385`	`cx.item_ty_poly(`
`386`		`- @~"buffer",`
	`386`	`+ @~"__Buffer",`
`387`	`387`	`cx.ty_rec(fields),`
`388`	`388`	`params)`
`389`	`389`	`}`