Skip to content

Commit 744b164

Browse files
committed
rustc: Move type logic out of typeck so trans doesn't look like it's calling into typeck
1 parent d7cbeba commit 744b164

File tree

5 files changed

+936
-912
lines changed

5 files changed

+936
-912
lines changed

src/comp/front/ast.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
import std.map.hashmap;
33
import std.option;
4-
import middle.typeck;
54
import util.common.span;
65
import util.common.spanned;
76
import util.common.ty_mach;
@@ -21,7 +20,7 @@ type ty_param = rec(ident ident, def_id id);
2120
// Annotations added during successive passes.
2221
tag ann {
2322
ann_none;
24-
ann_type(@typeck.ty);
23+
ann_type(@middle.ty.t);
2524
}
2625

2726
tag def {
@@ -168,7 +167,7 @@ tag lit_ {
168167
}
169168

170169
// NB: If you change this, you'll probably want to change the corresponding
171-
// type structure in middle/typeck.rs as well.
170+
// type structure in middle/ty.rs as well.
172171

173172
type ty_field = rec(ident ident, @ty ty);
174173
type ty_arg = rec(mode mode, @ty ty);

0 commit comments

Comments
 (0)