---

yaml
---
r: 4732
b: refs/heads/master
c: 9304b7e
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0107d6a81d2180d3a1e070e982e346038195cada
+refs/heads/master: 9304b7ee5980b889e941251a8a3990593c496eff

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

@@ -1755,6 +1755,9 @@ fn parse_ty_params(p: &parser) -> [ast::ty_param] {
         ty_params =
             parse_seq(token::LBRACKET, token::RBRACKET, some(token::COMMA),
                       parse_ty_param, p).node;
+    } else if p.peek() == token::LT {
+        p.bump();
+        ty_params = parse_seq_to_gt(some(token::COMMA), parse_ty_param, p);
     }
     if p.peek() == token::LT {
         ty_params =

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

@@ -1210,13 +1210,13 @@ fn print_kind(s: &ps, kind: ast::kind) {
 
 fn print_type_params(s: &ps, params: &[ast::ty_param]) {
     if vec::len(params) > 0u {
-        word(s.s, "[");
+        word(s.s, "<");
         fn printParam(s: &ps, param: &ast::ty_param) {
             print_kind(s, param.kind);
             word(s.s, param.ident);
         }
         commasep(s, inconsistent, params, printParam);
-        word(s.s, "]");
+        word(s.s, ">");
     }
 }