---

yaml
---
r: 3661
b: refs/heads/master
c: aad0bcc
h: refs/heads/master
i:
  3659: dfba33d
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 401b6362d7f99a3cebc863cb1b8906d62e9ba79b
+refs/heads/master: aad0bcc8d5e1ed9cf6ca0eedae21b3aa0c67ab16

trunk/src/comp/middle/typeck.rs

@@ -315,11 +315,7 @@ fn ast_ty_to_ty(&ty::ctxt tcx, &ty_getter getter, &@ast::ty ast_ty) -> ty::t {
             typ = ty::mk_chan(tcx, ast_ty_to_ty(tcx, getter, t));
         }
         case (ast::ty_tup(?fields)) {
-            let ty::mt[] flds = ~[];
-            ivec::reserve(flds, vec::len(fields));
-            for (ast::mt field in fields) {
-                flds += ~[ast_mt_to_mt(tcx, getter, field)];
-            }
+            auto flds = ivec::map(bind ast_mt_to_mt(tcx, getter, _), fields);
             typ = ty::mk_tup(tcx, flds);
         }
         case (ast::ty_rec(?fields)) {

trunk/src/comp/syntax/ast.rs

@@ -401,7 +401,7 @@ tag ty_ {
     ty_task;
     ty_port(@ty);
     ty_chan(@ty);
-    ty_tup(vec[mt]);
+    ty_tup(mt[]);
     ty_rec(vec[ty_field]);
     ty_fn(proto, vec[ty_arg], @ty, controlflow, vec[@constr]);
     ty_obj(vec[ty_method]);

trunk/src/comp/syntax/parse/parser.rs

@@ -520,8 +520,8 @@ fn parse_ty(&parser p) -> @ast::ty {
         expect(p, token::RBRACKET);
     } else if (eat_word(p, "tup")) {
         auto elems =
-            parse_seq(token::LPAREN, token::RPAREN, some(token::COMMA),
-                      parse_mt, p);
+            parse_seq_ivec(token::LPAREN, token::RPAREN, some(token::COMMA),
+                           parse_mt, p);
         hi = elems.span.hi;
         t = ast::ty_tup(elems.node);
     } else if (eat_word(p, "rec")) {

trunk/src/comp/syntax/print/pprust.rs

@@ -301,7 +301,7 @@ fn print_type(&ps s, &ast::ty ty) {
         case (ast::ty_tup(?elts)) {
             word(s.s, "tup");
             popen(s);
-            commasep(s, inconsistent, elts, print_mt);
+            commasep_ivec(s, inconsistent, elts, print_mt);
             pclose(s);
         }
         case (ast::ty_rec(?fields)) {