---

yaml
---
r: 35211
b: refs/heads/master
c: 57588ed
h: refs/heads/master
i:
  35209: 2ce7970
  35207: 9f42fd3
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b053f0b5e68233f664d087f06fc5ebaec2f19f97
+refs/heads/master: 57588edf3bc2450fd1daff4ec2565fe5edbedcef
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/libsyntax/ext/base.rs

@@ -100,6 +100,9 @@ fn syntax_expander_table() -> HashMap<~str, syntax_extension> {
     syntax_expanders.insert(~"deriving_eq",
                             item_decorator(
                                 ext::deriving::expand_deriving_eq));
+    syntax_expanders.insert(~"deriving_iter_bytes",
+                            item_decorator(
+                                ext::deriving::expand_deriving_iter_bytes));
 
     // Quasi-quoting expanders
     syntax_expanders.insert(~"quote_tokens",

trunk/src/libsyntax/ext/build.rs

@@ -141,6 +141,18 @@ fn mk_block(cx: ext_ctxt, sp: span,
                span: sp };
     mk_expr(cx, sp, ast::expr_block(blk))
 }
+fn mk_block_(cx: ext_ctxt, sp: span, +stmts: ~[@ast::stmt]) -> ast::blk {
+    {
+        node: {
+            view_items: ~[],
+            stmts: move stmts,
+            expr: None,
+            id: cx.next_id(),
+            rules: ast::default_blk
+        },
+        span: sp
+    }
+}
 fn mk_simple_block(cx: ext_ctxt, span: span, expr: @ast::expr) -> ast::blk {
     let block = {
         view_items: ~[],
@@ -177,4 +189,39 @@ fn mk_bool(cx: ext_ctxt, span: span, value: bool) -> @ast::expr {
     let lit_expr = ast::expr_lit(@{ node: ast::lit_bool(value), span: span });
     build::mk_expr(cx, span, move lit_expr)
 }
+fn mk_stmt(cx: ext_ctxt, span: span, expr: @ast::expr) -> @ast::stmt {
+    let stmt_ = ast::stmt_semi(expr, cx.next_id());
+    @{ node: move stmt_, span: span }
+}
+fn mk_ty_path(cx: ext_ctxt,
+              span: span,
+              idents: ~[ ast::ident ])
+           -> @ast::Ty {
+    let ty = build::mk_raw_path(span, idents);
+    let ty = ast::ty_path(ty, cx.next_id());
+    let ty = @{ id: cx.next_id(), node: move ty, span: span };
+    ty
+}
+fn mk_simple_ty_path(cx: ext_ctxt,
+                     span: span,
+                     ident: ast::ident)
+                  -> @ast::Ty {
+    mk_ty_path(cx, span, ~[ ident ])
+}
+fn mk_arg(cx: ext_ctxt,
+          span: span,
+          ident: ast::ident,
+          ty: @ast::Ty)
+       -> ast::arg {
+    let arg_pat = mk_pat_ident(cx, span, ident);
+    {
+        mode: ast::infer(cx.next_id()),
+        ty: ty,
+        pat: arg_pat,
+        id: cx.next_id()
+    }
+}
+fn mk_fn_decl(+inputs: ~[ast::arg], output: @ast::Ty) -> ast::fn_decl {
+    { inputs: move inputs, output: output, cf: ast::return_val }
+}