Skip to content

Remove ty_mac #10590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/librustc/middle/typeck/astconv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
1 change: 0 additions & 1 deletion src/libsyntax/ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/libsyntax/fold.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 0 additions & 3 deletions src/libsyntax/print/pprust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/visit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 => ()
}
}

Expand Down