Skip to content

Commit adb9cde

Browse files
ericktgraydon
authored andcommitted
Remove type parameter and vec/port/chan foo[T] syntax.
1 parent b3eba15 commit adb9cde

File tree

1 file changed

+6
-19
lines changed

1 file changed

+6
-19
lines changed

src/comp/syntax/parse/parser.rs

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -448,23 +448,17 @@ fn parse_ty_postfix(orig_t: ast::ty_, p: &parser, colons_before_params: bool)
448448
-> @ast::ty {
449449
let lo = p.get_lo_pos();
450450

451-
let seq;
452-
if p.peek() == token::LBRACKET {
453-
p.bump();
454-
seq = parse_seq_to_end(token::RBRACKET, some(token::COMMA),
455-
bind parse_ty(_, false), p);
456-
} else if colons_before_params && p.peek() == token::MOD_SEP {
451+
if colons_before_params && p.peek() == token::MOD_SEP {
457452
p.bump();
458453
expect(p, token::LT);
459-
seq = parse_seq_to_gt(some(token::COMMA), bind parse_ty(_, false), p);
460454
} else if !colons_before_params && p.peek() == token::LT {
461455
p.bump();
462-
seq = parse_seq_to_gt(some(token::COMMA), bind parse_ty(_, false), p);
463456
} else {
464457
ret @spanned(lo, p.get_lo_pos(), orig_t);
465458
}
466459

467460
// If we're here, we have explicit type parameter instantiation.
461+
let seq = parse_seq_to_gt(some(token::COMMA), bind parse_ty(_, false), p);
468462

469463
alt orig_t {
470464
ast::ty_path(pth, ann) {
@@ -575,17 +569,10 @@ fn parse_ty(p: &parser, colons_before_params: bool) -> @ast::ty {
575569
parse_type_constraints(p));
576570
}
577571
} else if (eat_word(p, "vec")) {
578-
if p.peek() == token::LBRACKET {
579-
p.bump();
580-
t = ast::ty_vec(parse_mt(p));
581-
hi = p.get_hi_pos();
582-
expect(p, token::RBRACKET);
583-
} else {
584-
expect(p, token::LT);
585-
t = ast::ty_vec(parse_mt(p));
586-
hi = p.get_hi_pos();
587-
expect_gt(p);
588-
}
572+
expect(p, token::LT);
573+
t = ast::ty_vec(parse_mt(p));
574+
hi = p.get_hi_pos();
575+
expect_gt(p);
589576
} else if (p.peek() == token::LBRACKET) {
590577
expect(p, token::LBRACKET);
591578
t = ast::ty_ivec(parse_mt(p));

0 commit comments

Comments
 (0)