---

yaml
---
r: 93785
b: refs/heads/try
c: 8470639
h: refs/heads/master
i:
  93783: 1646d1d
v: v3

Author: sanxiyn

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: ea5d1dfb1cab80bedf372d8b24a726ed054f2417
+refs/heads/try: 8470639319104f955eeceea58a62361aec733114
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/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));

branches/try/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

branches/try/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 {

branches/try/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");
       }

branches/try/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 => ()
     }
 }