Name types after their modules instead of 't'

2 files changed, 4 insertions, 4 deletions

diff --git a/src/rustc/syntax/ast.rs b/src/rustc/syntax/ast.rs
index 46e31799232..91a884ce57c 100644
--- a/src/rustc/syntax/ast.rs
+++ b/src/rustc/syntax/ast.rs
@@ -291,10 +291,10 @@ enum blk_sort {
 
 type mac = spanned<mac_>;
 
-type mac_arg = option::t<@expr>;
+type mac_arg = option<@expr>;
 
 type mac_body_ = {span: span};
-type mac_body = option::t<mac_body_>;
+type mac_body = option<mac_body_>;
 
 enum mac_ {
     mac_invoc(@path, mac_arg, mac_body),
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,