rustc: Eliminate metadata's dependency on trans

Author: brson

src/rustc/metadata.rs

@@ -1,3 +1,16 @@
+export maps;
+
+// Auxiliary maps of things to be encoded
+type maps = {
+    mutbl_map: middle::borrowck::mutbl_map,
+    copy_map: middle::alias::copy_map,
+    last_uses: middle::last_use::last_uses,
+    impl_map: middle::resolve::impl_map,
+    method_map: middle::typeck::method_map,
+    vtable_map: middle::typeck::vtable_map,
+    spill_map: middle::last_use::spill_map
+};
+
 // Define the rustc API's that the metadata module has access to
 // Over time we will reduce these dependencies and, once metadata has
 // no dependencies on rustc it can move into its own crate.
@@ -7,8 +20,6 @@ mod middle {
     export ast_map;
     import ty = middle_::ty;
     export ty;
-    import trans = middle_::trans;
-    export trans;
     import typeck = middle_::typeck;
     export typeck;
     import last_use = middle_::last_use;
@@ -17,12 +28,18 @@ mod middle {
     export freevars;
     import resolve = middle_::resolve;
     export resolve;
+    import borrowck = middle_::borrowck;
+    export borrowck;
+    import alias = middle_::alias;
+    export alias;
 }
 
 mod front {
 }
 
 mod back {
+    import link = back_::link;
+    export link;
 }
 
 mod driver {

src/rustc/metadata/astencode.rs

@@ -17,7 +17,6 @@ import std::serialization::serializer_helpers;
 import std::serialization::deserializer_helpers;
 import std::prettyprint::serializer;
 import std::smallintmap::map;
-import middle::trans::common::maps;
 import middle::{ty, typeck, last_use, ast_map};
 import middle::typeck::{method_origin,
                         serialize_method_origin,
@@ -657,7 +656,7 @@ impl helpers for ebml::ebml_deserializer {
 impl helpers for @e::encode_ctxt {
     fn ty_str_ctxt() -> @tyencode::ctxt {
         @{ds: e::def_to_str,
-          tcx: self.ccx.tcx,
+          tcx: self.tcx,
           reachable: encoder::reachable(self, _),
           abbrevs: tyencode::ac_use_abbrevs(self.type_abbrevs)}
     }
@@ -721,8 +720,7 @@ fn encode_side_tables_for_ii(ecx: @e::encode_ctxt,
 fn encode_side_tables_for_id(ecx: @e::encode_ctxt,
                              ebml_w: ebml::writer,
                              id: ast::node_id) {
-    let ccx = ecx.ccx;
-    let tcx = ccx.tcx;
+    let tcx = ecx.tcx;
 
     #debug["Encoding side tables for id %d", id];
 
@@ -796,25 +794,25 @@ fn encode_side_tables_for_id(ecx: @e::encode_ctxt,
     //    }
     //}
 
-    option::iter(ccx.maps.mutbl_map.find(id)) {|_m|
+    option::iter(ecx.maps.mutbl_map.find(id)) {|_m|
         ebml_w.tag(c::tag_table_mutbl) {||
             ebml_w.id(id);
         }
     }
 
-    option::iter(ccx.maps.copy_map.find(id)) {|_m|
+    option::iter(ecx.maps.copy_map.find(id)) {|_m|
         ebml_w.tag(c::tag_table_copy) {||
             ebml_w.id(id);
         }
     }
 
-    option::iter(ccx.maps.spill_map.find(id)) {|_m|
+    option::iter(ecx.maps.spill_map.find(id)) {|_m|
         ebml_w.tag(c::tag_table_spill) {||
             ebml_w.id(id);
         }
     }
 
-    option::iter(ccx.maps.last_uses.find(id)) {|m|
+    option::iter(ecx.maps.last_uses.find(id)) {|m|
         ebml_w.tag(c::tag_table_last_use) {||
             ebml_w.id(id);
             ebml_w.tag(c::tag_table_val) {||
@@ -826,7 +824,7 @@ fn encode_side_tables_for_id(ecx: @e::encode_ctxt,
     // impl_map is not used except when emitting metadata,
     // don't need to keep it.
 
-    option::iter(ccx.maps.method_map.find(id)) {|mo|
+    option::iter(ecx.maps.method_map.find(id)) {|mo|
         ebml_w.tag(c::tag_table_method_map) {||
             ebml_w.id(id);
             ebml_w.tag(c::tag_table_val) {||
@@ -835,7 +833,7 @@ fn encode_side_tables_for_id(ecx: @e::encode_ctxt,
         }
     }
 
-    option::iter(ccx.maps.vtable_map.find(id)) {|dr|
+    option::iter(ecx.maps.vtable_map.find(id)) {|dr|
         ebml_w.tag(c::tag_table_vtable_map) {||
             ebml_w.id(id);
             ebml_w.tag(c::tag_table_val) {||

src/rustc/metadata/common.rs

@@ -131,4 +131,3 @@ fn hash_path(&&s: str) -> uint {
     for str::each(s) {|ch| h = (h << 5u) + h ^ (ch as uint); }
     ret h;
 }
-

src/rustc/metadata/csearch.rs

@@ -7,7 +7,6 @@ import middle::{ty, ast_map};
 import option::{some, none};
 import driver::session;
 import driver::session::expect;
-import middle::trans::common::maps;
 import common::*;
 import std::map::hashmap;
 

src/rustc/metadata/decoder.rs

@@ -13,7 +13,6 @@ import tydecode::{parse_ty_data, parse_def_id, parse_bounds_data,
         parse_ident};
 import syntax::print::pprust;
 import cmd=cstore::crate_metadata;
-import middle::trans::common::maps;
 import util::ppaux::ty_to_str;
 import ebml::deserializer;