---

yaml
---
r: 4501
b: refs/heads/master
c: 00ccd6b
h: refs/heads/master
i:
  4499: 8575171
v: v3

Author: erickt

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 491ed7f12c2c9adf186599ac5294cb24825ad36b
+refs/heads/master: 00ccd6ba4272c487c62b06544219ee150307482a

trunk/src/comp/middle/trans.rs

@@ -6886,7 +6886,7 @@ fn vtbl_mthd_lteq(a: &vtbl_mthd, b: &vtbl_mthd) -> bool {
 // Used by create_vtbl to filter a list of methods to remove the ones that we
 // don't need forwarding slots for.
 fn filtering_fn(cx: @local_ctxt, m: &vtbl_mthd,
-                addtl_meths: (@ast::method)[]) ->
+                addtl_meths: [@ast::method]) ->
     option::t[vtbl_mthd] {
 
     // Since m is a fwding_mthd, and we're checking to see if it's in

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

@@ -429,42 +429,23 @@ fn parse_ty_postfix(orig_t: ast::ty_, p: &parser) -> @ast::ty {
         // This is explicit type parameter instantiation.
         p.bump();
 
-        let mut;
-        if eat_word(p, "mutable") {
-            if p.peek() == token::QUES {
-                p.bump();
-                mut = ast::maybe_mut;
-            } else { mut = ast::mut; }
-        } else { mut = ast::imm; }
-
-        if mut == ast::imm && p.peek() != token::RBRACKET {
-            // This is explicit type parameter instantiation.
-            let seq =
-                parse_seq_to_end(token::RBRACKET, some(token::COMMA),
-                                 parse_ty, p);
-
+        let seq =
+            parse_seq_to_end(token::RBRACKET, some(token::COMMA),
+                             parse_ty, p);
 
-            alt orig_t {
-              ast::ty_path(pth, ann) {
-                let hi = p.get_hi_pos();
-                ret @spanned(lo, hi,
-                             ast::ty_path(spanned(lo, hi,
-                                                  {global: pth.node.global,
-                                                   idents: pth.node.idents,
-                                                   types: seq}), ann));
-              }
-              _ {
-                p.fatal("type parameter instantiation only allowed for " +
-                            "paths");
-              }
-            }
+        alt orig_t {
+          ast::ty_path(pth, ann) {
+            let hi = p.get_hi_pos();
+            ret @spanned(lo, hi,
+                         ast::ty_path(spanned(lo, hi,
+                                              {global: pth.node.global,
+                                               idents: pth.node.idents,
+                                               types: seq}), ann));
+          }
+          _ {
+            p.fatal("type parameter instantiation only allowed for paths");
+          }
         }
-
-        expect(p, token::RBRACKET);
-        let hi = p.get_hi_pos();
-        // FIXME: spans are probably wrong
-        let t = ast::ty_ivec({ty: @spanned(lo, hi, orig_t), mut: mut});
-        ret parse_ty_postfix(t, p);
     }
     ret @spanned(lo, p.get_lo_pos(), orig_t);
 }