Skip to content

Commit ca614db

Browse files
committed
---
yaml --- r: 47753 b: refs/heads/incoming c: baeac2f h: refs/heads/master i: 47751: ce4e789 v: v3
1 parent 1d75710 commit ca614db

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: de57bacf436499270e48db4820baa24f68f1542b
9+
refs/heads/incoming: baeac2f9ac0e64eefe22779d28a421c5f5eadb58
1010
refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,12 @@ pub trait ext_ctxt_ast_builder {
9393
ty_params: ~[ast::ty_param]) -> @ast::item;
9494
fn item_struct(&self, name: ident, span: span,
9595
struct_def: ast::struct_def) -> @ast::item;
96-
fn struct_expr(&self, path: @ast::path, fields: ~[ast::field]) -> @ast::expr;
97-
fn variant(&self, name: ident, span: span, +tys: ~[@ast::Ty]) -> ast::variant;
98-
fn item_mod(&self, name: ident, span: span, +items: ~[@ast::item]) -> @ast::item;
96+
fn struct_expr(&self, path: @ast::path,
97+
fields: ~[ast::field]) -> @ast::expr;
98+
fn variant(&self, name: ident, span: span,
99+
+tys: ~[@ast::Ty]) -> ast::variant;
100+
fn item_mod(&self, name: ident, span: span,
101+
+items: ~[@ast::item]) -> @ast::item;
99102
fn ty_path_ast_builder(&self, path: @ast::path) -> @ast::Ty;
100103
fn item_ty_poly(&self, name: ident,
101104
span: span,
@@ -282,7 +285,8 @@ pub impl ext_ctxt_ast_builder for ext_ctxt {
282285
self.item(name, span, ast::item_struct(@struct_def, ty_params))
283286
}
284287

285-
fn struct_expr(&self, path: @ast::path, fields: ~[ast::field]) -> @ast::expr {
288+
fn struct_expr(&self, path: @ast::path,
289+
fields: ~[ast::field]) -> @ast::expr {
286290
@ast::expr {
287291
id: self.next_id(),
288292
callee_id: self.next_id(),

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ pub trait gen_send {
3333

3434
pub trait to_type_decls {
3535
fn to_type_decls(&self, cx: ext_ctxt) -> ~[@ast::item];
36-
fn to_endpoint_decls(&self, cx: ext_ctxt, dir: direction) -> ~[@ast::item];
36+
fn to_endpoint_decls(&self, cx: ext_ctxt,
37+
dir: direction) -> ~[@ast::item];
3738
}
3839

3940
pub trait gen_init {
@@ -253,7 +254,8 @@ pub impl to_type_decls for state {
253254
]
254255
}
255256
256-
fn to_endpoint_decls(&self, cx: ext_ctxt, dir: direction) -> ~[@ast::item] {
257+
fn to_endpoint_decls(&self, cx: ext_ctxt,
258+
dir: direction) -> ~[@ast::item] {
257259
debug!("pipec: to_endpoint_decls");
258260
let dir = match dir {
259261
send => (*self).dir,

0 commit comments

Comments
 (0)