---

yaml
---
r: 42424
b: refs/heads/try
c: e1f1a12
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: df7d376d257858debdc29c954c6d2fb3d9ef2334
+refs/heads/try: e1f1a1204ad3a68a90490fcad69ab2c3e6be4086
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libsyntax/ast.rs

@@ -121,7 +121,11 @@ enum ty_param_bound {
 
 #[auto_encode]
 #[auto_decode]
-type ty_param = {ident: ident, id: node_id, bounds: @~[ty_param_bound]};
+struct ty_param {
+    ident: ident,
+    id: node_id,
+    bounds: @~[ty_param_bound]
+}
 
 #[auto_encode]
 #[auto_decode]

branches/try/src/libsyntax/ext/auto_encode.rs

@@ -251,7 +251,7 @@ priv impl ext_ctxt {
             span: span,
         });
 
-        {
+        ast::ty_param {
             ident: ident,
             id: self.next_id(),
             bounds: @vec::append(~[bound], *bounds)
@@ -425,7 +425,7 @@ fn mk_impl(
                 span: span,
             });
 
-            {
+            ast::ty_param {
                 ident: tp.ident,
                 id: cx.next_id(),
                 bounds: @vec::append(~[t_bound], *tp.bounds)

branches/try/src/libsyntax/ext/build.rs

@@ -313,6 +313,6 @@ fn mk_ty_param(cx: ext_ctxt,
                ident: ast::ident,
                bounds: @~[ast::ty_param_bound])
             -> ast::ty_param {
-    { ident: ident, id: cx.next_id(), bounds: bounds }
+    ast::ty_param { ident: ident, id: cx.next_id(), bounds: bounds }
 }
 

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

@@ -177,7 +177,7 @@ impl ext_ctxt: ext_ctxt_ast_builder {
     fn ty_param(id: ast::ident, +bounds: ~[ast::ty_param_bound])
         -> ast::ty_param
     {
-        {ident: id, id: self.next_id(), bounds: @bounds}
+        ast::ty_param { ident: id, id: self.next_id(), bounds: @bounds }
     }
 
     fn arg(name: ident, ty: @ast::Ty) -> ast::arg {

branches/try/src/libsyntax/fold.rs

@@ -148,13 +148,13 @@ fn fold_ty_param_bound(tpb: ty_param_bound, fld: ast_fold) -> ty_param_bound {
 }
 
 fn fold_ty_param(tp: ty_param, fld: ast_fold) -> ty_param {
-    {ident: /* FIXME (#2543) */ copy tp.ident,
-     id: fld.new_id(tp.id),
-     bounds: @vec::map(*tp.bounds, |x| fold_ty_param_bound(*x, fld) )}
+    ast::ty_param { ident: /* FIXME (#2543) */ copy tp.ident,
+                    id: fld.new_id(tp.id),
+                    bounds: @tp.bounds.map(|x| fold_ty_param_bound(*x, fld) )}
 }
 
 fn fold_ty_params(tps: ~[ty_param], fld: ast_fold) -> ~[ty_param] {
-    vec::map(tps, |x| fold_ty_param(*x, fld) )
+    tps.map(|x| fold_ty_param(*x, fld))
 }
 
 fn noop_fold_crate(c: crate_, fld: ast_fold) -> crate_ {

branches/try/src/libsyntax/parse/parser.rs

@@ -2458,7 +2458,7 @@ impl Parser {
     fn parse_ty_param() -> ty_param {
         let ident = self.parse_ident();
         let bounds = self.parse_optional_ty_param_bounds();
-        return {ident: ident, id: self.get_id(), bounds: bounds};
+        ast::ty_param { ident: ident, id: self.get_id(), bounds: bounds }
     }
 
     fn parse_ty_params() -> ~[ty_param] {