From b968c8e6cd362567bf0047a96d261691dfca43e8 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 13 Mar 2012 14:39:28 -0700
Subject: Name types after their modules instead of 't'

---
 src/rustc/syntax/parse/parser.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/rustc/syntax/parse/parser.rs')

diff --git a/src/rustc/syntax/parse/parser.rs b/src/rustc/syntax/parse/parser.rs
index 6fd61bc9db4..4beefe21632 100644
--- a/src/rustc/syntax/parse/parser.rs
+++ b/src/rustc/syntax/parse/parser.rs
@@ -643,7 +643,7 @@ fn parse_seq<T: copy>(bra: token::token, ket: token::token,
     ret spanned(lo, hi, result);
 }
 
-fn have_dollar(p: parser) -> option::t<ast::mac_> {
+fn have_dollar(p: parser) -> option<ast::mac_> {
     alt p.token {
       token::DOLLAR_NUM(num) {
         p.bump();
@@ -2384,7 +2384,7 @@ else { ret none; }
 
 // A type to distingush between the parsing of item attributes or syntax
 // extensions, which both begin with token.POUND
-type attr_or_ext = option<either::t<[ast::attribute], @ast::expr>>;
+type attr_or_ext = option<either<[ast::attribute], @ast::expr>>;
 
 fn parse_outer_attrs_or_ext(
     p: parser,
-- 
cgit 1.4.1-3-g733a5