librustc: De-export rustc. rs=deexporting

Author: pcwalton

src/librustc/middle/astencode.rs

@@ -50,12 +50,8 @@ use syntax::visit;
 use syntax;
 use writer = std::ebml::writer;
 
-export maps;
-export encode_inlined_item;
-export decode_inlined_item;
-
 // Auxiliary maps of things to be encoded
-type maps = {
+pub type maps = {
     mutbl_map: middle::borrowck::mutbl_map,
     root_map: middle::borrowck::root_map,
     last_use_map: middle::liveness::last_use_map,
@@ -91,11 +87,11 @@ trait tr_intern {
 // ______________________________________________________________________
 // Top-level methods.
 
-fn encode_inlined_item(ecx: @e::encode_ctxt,
-                       ebml_w: writer::Encoder,
-                       path: &[ast_map::path_elt],
-                       ii: ast::inlined_item,
-                       maps: maps) {
+pub fn encode_inlined_item(ecx: @e::encode_ctxt,
+                           ebml_w: writer::Encoder,
+                           path: &[ast_map::path_elt],
+                           ii: ast::inlined_item,
+                           maps: maps) {
     debug!("> Encoding inlined item: %s::%s (%u)",
            ast_map::path_to_str(path, ecx.tcx.sess.parse_sess.interner),
            ecx.tcx.sess.str_of(ii.ident()),
@@ -114,11 +110,12 @@ fn encode_inlined_item(ecx: @e::encode_ctxt,
            ebml_w.writer.tell());
 }
 
-fn decode_inlined_item(cdata: cstore::crate_metadata,
-                       tcx: ty::ctxt,
-                       maps: maps,
-                       +path: ast_map::path,
-                       par_doc: ebml::Doc) -> Option<ast::inlined_item> {
+pub fn decode_inlined_item(cdata: cstore::crate_metadata,
+                           tcx: ty::ctxt,
+                           maps: maps,
+                           +path: ast_map::path,
+                           par_doc: ebml::Doc)
+                        -> Option<ast::inlined_item> {
     let dcx = @{cdata: cdata, tcx: tcx, maps: maps};
     match par_doc.opt_child(c::tag_ast) {
       None => None,

src/librustc/middle/capture.rs

@@ -20,37 +20,27 @@ use std::map;
 use syntax::codemap::span;
 use syntax::{ast, ast_util};
 
-export capture_mode;
-export capture_var;
-export capture_map;
-export check_capture_clause;
-export compute_capture_vars;
-export cap_copy;
-export cap_move;
-export cap_drop;
-export cap_ref;
-
-enum capture_mode {
+pub enum capture_mode {
     cap_copy, // Copy the value into the closure.
     cap_move, // Move the value into the closure.
     cap_drop, // Drop value after creating closure.
     cap_ref,  // Reference directly from parent stack frame (block fn).
 }
 
-type capture_var = {
+pub type capture_var = {
     def: ast::def,                       // Variable being accessed free
     span: span,                          // Location of access or cap item
     cap_item: Option<ast::capture_item>, // Capture item, if any
     mode: capture_mode                   // How variable is being accessed
 };
 
-type capture_map = map::HashMap<ast::def_id, capture_var>;
+pub type capture_map = map::HashMap<ast::def_id, capture_var>;
 
 // checks the capture clause for a fn_expr() and issues warnings or
 // errors for any irregularities which we identify.
-fn check_capture_clause(tcx: ty::ctxt,
-                        fn_expr_id: ast::node_id,
-                        cap_clause: ast::capture_clause) {
+pub fn check_capture_clause(tcx: ty::ctxt,
+                            fn_expr_id: ast::node_id,
+                            cap_clause: ast::capture_clause) {
     let freevars = freevars::get_freevars(tcx, fn_expr_id);
     let seen_defs = map::HashMap();
 
@@ -73,10 +63,11 @@ fn check_capture_clause(tcx: ty::ctxt,
     }
 }
 
-fn compute_capture_vars(tcx: ty::ctxt,
-                        fn_expr_id: ast::node_id,
-                        fn_proto: ast::Proto,
-                        cap_clause: ast::capture_clause) -> ~[capture_var] {
+pub fn compute_capture_vars(tcx: ty::ctxt,
+                            fn_expr_id: ast::node_id,
+                            fn_proto: ast::Proto,
+                            cap_clause: ast::capture_clause)
+                         -> ~[capture_var] {
     let freevars = freevars::get_freevars(tcx, fn_expr_id);
     let cap_map = map::HashMap();
 

src/librustc/middle/check_const.rs

@@ -22,9 +22,12 @@ use std::map::HashMap;
 use syntax::ast::*;
 use syntax::{visit, ast_util, ast_map};
 
-fn check_crate(sess: Session, crate: @crate, ast_map: ast_map::map,
-               def_map: resolve::DefMap,
-                method_map: typeck::method_map, tcx: ty::ctxt) {
+pub fn check_crate(sess: Session,
+                   crate: @crate,
+                   ast_map: ast_map::map,
+                   def_map: resolve::DefMap,
+                   method_map: typeck::method_map,
+                   tcx: ty::ctxt) {
     visit::visit_crate(*crate, false, visit::mk_vt(@visit::Visitor {
         visit_item: |a,b,c| check_item(sess, ast_map, def_map, a, b, c),
         visit_pat: check_pat,
@@ -35,9 +38,12 @@ fn check_crate(sess: Session, crate: @crate, ast_map: ast_map::map,
     sess.abort_if_errors();
 }
 
-fn check_item(sess: Session, ast_map: ast_map::map,
-              def_map: resolve::DefMap,
-              it: @item, &&_is_const: bool, v: visit::vt<bool>) {
+pub fn check_item(sess: Session,
+                  ast_map: ast_map::map,
+                  def_map: resolve::DefMap,
+                  it: @item,
+                  &&_is_const: bool,
+                  v: visit::vt<bool>) {
     match it.node {
       item_const(_, ex) => {
         (v.visit_expr)(ex, true, v);
@@ -54,7 +60,7 @@ fn check_item(sess: Session, ast_map: ast_map::map,
     }
 }
 
-fn check_pat(p: @pat, &&_is_const: bool, v: visit::vt<bool>) {
+pub fn check_pat(p: @pat, &&_is_const: bool, v: visit::vt<bool>) {
     fn is_str(e: @expr) -> bool {
         match e.node {
             expr_vstore(
@@ -75,9 +81,13 @@ fn check_pat(p: @pat, &&_is_const: bool, v: visit::vt<bool>) {
     }
 }
 
-fn check_expr(sess: Session, def_map: resolve::DefMap,
-              method_map: typeck::method_map, tcx: ty::ctxt,
-              e: @expr, &&is_const: bool, v: visit::vt<bool>) {
+pub fn check_expr(sess: Session,
+                  def_map: resolve::DefMap,
+                  method_map: typeck::method_map,
+                  tcx: ty::ctxt,
+                  e: @expr,
+                  &&is_const: bool,
+                  v: visit::vt<bool>) {
     if is_const {
         match e.node {
           expr_unary(box(_), _) | expr_unary(uniq(_), _) |
@@ -194,9 +204,10 @@ fn check_expr(sess: Session, def_map: resolve::DefMap,
 
 // Make sure a const item doesn't recursively refer to itself
 // FIXME: Should use the dependency graph when it's available (#1356)
-fn check_item_recursion(sess: Session, ast_map: ast_map::map,
-                        def_map: resolve::DefMap, it: @item) {
-
+pub fn check_item_recursion(sess: Session,
+                            ast_map: ast_map::map,
+                            def_map: resolve::DefMap,
+                            it: @item) {
     type env = {
         root_it: @item,
         sess: Session,

src/librustc/middle/check_loop.rs

@@ -14,9 +14,9 @@ use middle::ty;
 use syntax::ast::*;
 use syntax::visit;
 
-type ctx = {in_loop: bool, can_ret: bool};
+pub type ctx = {in_loop: bool, can_ret: bool};
 
-fn check_crate(tcx: ty::ctxt, crate: @crate) {
+pub fn check_crate(tcx: ty::ctxt, crate: @crate) {
     visit::visit_crate(*crate,
                        {in_loop: false, can_ret: true},
                        visit::mk_vt(@visit::Visitor {