aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2011-04-01 17:23:56 -0700
committerGraydon Hoare <[email protected]>2011-04-01 17:23:56 -0700
commit23f18a096f9843595eff5e408653187f49114977 (patch)
tree6da4f7e5724dc808264538466441277905ed6ce9 /src
parentSupport for passing native types through metadata/creader. (diff)
downloadrust-23f18a096f9843595eff5e408653187f49114977.tar.xz
rust-23f18a096f9843595eff5e408653187f49114977.zip
Re-enable typestate_check in build, was lost during merge. Sorry.
Diffstat (limited to 'src')
-rw-r--r--src/comp/driver/rustc.rs2
-rw-r--r--src/comp/middle/typestate_check.rs2
-rw-r--r--src/comp/rustc.rc1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index 657c098d..a1fdb387 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -8,7 +8,7 @@ import middle.trans;
import middle.resolve;
import middle.ty;
import middle.typeck;
-// import middle.typestate_check;
+import middle.typestate_check;
import util.common;
import std.map.mk_hashmap;
diff --git a/src/comp/middle/typestate_check.rs b/src/comp/middle/typestate_check.rs
index 9b670fc1..46bf6a4c 100644
--- a/src/comp/middle/typestate_check.rs
+++ b/src/comp/middle/typestate_check.rs
@@ -341,7 +341,7 @@ impure fn find_pre_post_item(fn_info enclosing, &item i) -> item {
case (ast.item_ty(_,_,_,_,_)) {
ret i;
}
- case (ast.item_tag(_,_,_,_)) {
+ case (ast.item_tag(_,_,_,_,_)) {
ret i;
}
case (ast.item_obj(?id, ?o, ?ps, ?di, ?a)) {
diff --git a/src/comp/rustc.rc b/src/comp/rustc.rc
index 98fae38b..952ea7e8 100644
--- a/src/comp/rustc.rc
+++ b/src/comp/rustc.rc
@@ -20,6 +20,7 @@ mod middle {
mod trans;
mod ty;
mod typeck;
+ mod typestate_check;
}
mod back {