---

brson · brson · commit 8125bef9e3c8 · 2012-08-15T15:09:39.000-07:00
yaml --- r: 23254 b: refs/heads/master c: fd0f616 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c0140f5c344a206b4147d03d306bd6c83468d30b
+refs/heads/master: fd0f616ceb17ac283717322674e35b7589a27232
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
diff --git a/trunk/src/libsyntax/ext/pipes/pipec.rs b/trunk/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`	`}`