new borrow checker (mass squash)

2 files changed, 17 insertions, 12 deletions

diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs
index 2e64c0c45bf..e899b1abc26 100644
--- a/src/librustc/driver/driver.rs
+++ b/src/librustc/driver/driver.rs
@@ -263,7 +263,7 @@ pub fn compile_rest(sess: Session,
              middle::check_loop::check_crate(ty_cx, crate));
 
         let middle::moves::MoveMaps {moves_map, variable_moves_map,
-                                     capture_map} =
+                                     moved_variables_set, capture_map} =
             time(time_passes, ~"compute moves", ||
                  middle::moves::compute_moves(ty_cx, method_map, crate));
 
@@ -271,20 +271,19 @@ pub fn compile_rest(sess: Session,
              middle::check_match::check_crate(ty_cx, method_map,
                                               moves_map, crate));
 
-        let last_use_map =
-            time(time_passes, ~"liveness checking", ||
-                 middle::liveness::check_crate(ty_cx, method_map,
-                                               variable_moves_map,
-                                               capture_map, crate));
+        time(time_passes, ~"liveness checking", ||
+             middle::liveness::check_crate(ty_cx, method_map,
+                                           variable_moves_map,
+                                           capture_map, crate));
 
-        let (root_map, mutbl_map, write_guard_map) =
+        let (root_map, write_guard_map) =
             time(time_passes, ~"borrow checking", ||
                  middle::borrowck::check_crate(ty_cx, method_map,
-                                               moves_map, capture_map,
-                                               crate));
+                                               moves_map, moved_variables_set,
+                                               capture_map, crate));
 
         time(time_passes, ~"kind checking", ||
-             kind::check_crate(ty_cx, method_map, last_use_map, crate));
+             kind::check_crate(ty_cx, method_map, crate));
 
         time(time_passes, ~"lint checking", ||
              lint::check_crate(ty_cx, crate));
@@ -292,9 +291,7 @@ pub fn compile_rest(sess: Session,
         if upto == cu_no_trans { return (crate, Some(ty_cx)); }
 
         let maps = astencode::Maps {
-            mutbl_map: mutbl_map,
             root_map: root_map,
-            last_use_map: last_use_map,
             method_map: method_map,
             vtable_map: vtable_map,
             write_guard_map: write_guard_map,
diff --git a/src/librustc/driver/session.rs b/src/librustc/driver/session.rs
index 55c81e6d17b..fff97d2436a 100644
--- a/src/librustc/driver/session.rs
+++ b/src/librustc/driver/session.rs
@@ -173,15 +173,19 @@ pub type Session = @Session_;
 
 pub impl Session_ {
     fn span_fatal(@self, sp: span, msg: ~str) -> ! {
+        debug!("span_fatal invoked: %s", msg);
         self.span_diagnostic.span_fatal(sp, msg)
     }
     fn fatal(@self, msg: ~str) -> ! {
+        debug!("fatal invoked: %s", msg);
         self.span_diagnostic.handler().fatal(msg)
     }
     fn span_err(@self, sp: span, msg: ~str) {
+        debug!("span_err invoked: %s", msg);
         self.span_diagnostic.span_err(sp, msg)
     }
     fn err(@self, msg: ~str) {
+        debug!("err invoked: %s", msg);
         self.span_diagnostic.handler().err(msg)
     }
     fn has_errors(@self) -> bool {
@@ -191,15 +195,19 @@ pub impl Session_ {
         self.span_diagnostic.handler().abort_if_errors()
     }
     fn span_warn(@self, sp: span, msg: ~str) {
+        debug!("span_warn invoked: %s", msg);
         self.span_diagnostic.span_warn(sp, msg)
     }
     fn warn(@self, msg: ~str) {
+        debug!("warn invoked: %s", msg);
         self.span_diagnostic.handler().warn(msg)
     }
     fn span_note(@self, sp: span, msg: ~str) {
+        debug!("span_note invoked: %s", msg);
         self.span_diagnostic.span_note(sp, msg)
     }
     fn note(@self, msg: ~str) {
+        debug!("note invoked: %s", msg);
         self.span_diagnostic.handler().note(msg)
     }
     fn span_bug(@self, sp: span, msg: ~str) -> ! {