Typestate

Makefile.in

@@ -137,7 +137,7 @@ STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/lib/,*.rc *.rs */*.rs))
 
 COMPILER_CRATE := $(S)src/comp/rustc.rc
 COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/comp/, \
-                                rustc.rc *.rs */*.rs))
+                                rustc.rc *.rs */*.rs */*/*.rs))
 
 ######################################################################
 # Main target dependency variables

src/comp/driver/rustc.rs

@@ -104,9 +104,9 @@ fn compile_input(session::session sess,
     auto type_cache = typeck_result._1;
 
     if (sess.get_opts().run_typestate) {
-        crate = time(time_passes, "typestate checking",
-                     bind middle::tstate::ck::check_crate(node_type_table,
-                                                          ty_cx, crate));
+        time(time_passes, "typestate checking",
+             bind middle::tstate::ck::check_crate(node_type_table,
+                                                  ty_cx, crate));
     }
 
     auto llmod = time[llvm::ModuleRef](time_passes, "translation",

src/comp/front/ast.rs

@@ -23,8 +23,7 @@ type ty_param = ident;
 // Annotations added during successive passes.
 type ann = rec(uint id,
                middle::ty::t ty,
-               option::t[vec[middle::ty::t]] tps,
-               option::t[@ts_ann] ts);
+               option::t[vec[middle::ty::t]] tps);
 
 tag def {
     def_fn(def_id);

src/comp/front/parser.rs

@@ -147,11 +147,10 @@ fn new_parser(session::session sess,
             fn get_chpos() -> uint {ret rdr.get_chpos();}
 
             fn get_ann() -> ast::ann {
-                // TODO: Remove ty, tps, and ts. ty and tps should be unused
+                // TODO: Remove ty and tps, which should be unused
                 // by now.
                 auto rv = rec(id=next_ann_var, ty=0u,
-                              tps=none[vec[middle::ty::t]],
-                              ts=none[@middle::tstate::ann::ts_ann]);
+                              tps=none[vec[middle::ty::t]]);
                 next_ann_var += 1u;
                 ret rv;
             }