auto merge of #10590 : sanxiyn/rust/ty-mac, r=thestinger

src/librustc/middle/typeck/astconv.rs

@@ -560,10 +560,6 @@ pub fn ast_ty_to_ty<AC:AstConv, RS:RegionScope>(
             ast_ty.span,
             "found `ty_infer` in unexpected place");
       }
-      ast::ty_mac(_) => {
-        tcx.sess.span_bug(ast_ty.span,
-                          "found `ty_mac` in unexpected place");
-      }
     };
 
     tcx.ast_ty_to_ty_cache.insert(ast_ty.id, ty::atttce_resolved(typ));

src/libsyntax/ast.rs

@@ -861,7 +861,6 @@ pub enum ty_ {
     ty_bare_fn(@TyBareFn),
     ty_tup(~[Ty]),
     ty_path(Path, Option<OptVec<TyParamBound>>, NodeId), // for #7264; see above
-    ty_mac(mac),
     ty_typeof(@Expr),
     // ty_infer means the type should be inferred instead of it having been
     // specified. This should only appear at the "top level" of a type and not

src/libsyntax/fold.rs

@@ -277,7 +277,6 @@ pub trait ast_fold {
             ty_fixed_length_vec(ref mt, e) => {
                 ty_fixed_length_vec(fold_mt(mt, self), self.fold_expr(e))
             }
-            ty_mac(ref mac) => ty_mac(self.fold_mac(mac)),
             ty_typeof(expr) => ty_typeof(self.fold_expr(expr)),
         };
         Ty {

src/libsyntax/print/pprust.rs

@@ -459,9 +459,6 @@ pub fn print_type(s: @ps, ty: &ast::Ty) {
           print_expr(s, e);
           word(s.s, ")");
       }
-      ast::ty_mac(_) => {
-          fail!("print_type doesn't know how to print a ty_mac");
-      }
       ast::ty_infer => {
           fail!("print_type shouldn't see a ty_infer");
       }

src/libsyntax/visit.rs

@@ -314,7 +314,7 @@ pub fn walk_ty<E:Clone, V:Visitor<E>>(visitor: &mut V, typ: &Ty, env: E) {
         ty_typeof(expression) => {
             visitor.visit_expr(expression, env)
         }
-        ty_nil | ty_bot | ty_mac(_) | ty_infer => ()
+        ty_nil | ty_bot | ty_infer => ()
     }
 }