rustc: Change all non-keyword uses of "link"

11 files changed, 39 insertions, 36 deletions

diff --git a/src/rustc/back/link.rs b/src/rustc/back/linkage.rs
index 0079ec9f363..0079ec9f363 100644
--- a/src/rustc/back/link.rs
+++ b/src/rustc/back/linkage.rs
diff --git a/src/rustc/driver/driver.rs b/src/rustc/driver/driver.rs
index 44d62e8d926..b476fa5217b 100644
--- a/src/rustc/driver/driver.rs
+++ b/src/rustc/driver/driver.rs
@@ -7,7 +7,7 @@ use syntax::attr;
 use middle::{trans, freevars, kind, ty, typeck, lint};
 use syntax::print::{pp, pprust};
 use util::ppaux;
-use back::link;
+use back::linkage;
 use result::{Ok, Err};
 use std::getopts;
 use io::WriterUtil;
@@ -258,20 +258,20 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
                                  exp_map, exp_map2, maps));
 
     time(time_passes, ~"LLVM passes", ||
-        link::write::run_passes(sess, llmod,
-                                &outputs.obj_filename));
+        linkage::write::run_passes(sess, llmod,
+                                   &outputs.obj_filename));
 
     let stop_after_codegen =
-        sess.opts.output_type != link::output_type_exe ||
-        (sess.opts.static && sess.building_library)    ||
+        sess.opts.output_type != linkage::output_type_exe ||
+        (sess.opts.static && sess.building_library)       ||
         sess.opts.jit;
 
     if stop_after_codegen { return {crate: crate, tcx: Some(ty_cx)}; }
 
     time(time_passes, ~"linking", ||
-         link::link_binary(sess,
-                           &outputs.obj_filename,
-                           &outputs.out_filename, link_meta));
+         linkage::link_binary(sess,
+                              &outputs.obj_filename,
+                              &outputs.out_filename, link_meta));
 
     return {crate: crate, tcx: Some(ty_cx)};
 }
@@ -492,17 +492,19 @@ fn build_session_options(binary: ~str,
     let jit = opt_present(matches, ~"jit");
     let output_type =
         if parse_only || no_trans {
-            link::output_type_none
+            linkage::output_type_none
         } else if opt_present(matches, ~"S") &&
                   opt_present(matches, ~"emit-llvm") {
-            link::output_type_llvm_assembly
+            linkage::output_type_llvm_assembly
         } else if opt_present(matches, ~"S") {
-            link::output_type_assembly
+            linkage::output_type_assembly
         } else if opt_present(matches, ~"c") {
-            link::output_type_object
+            linkage::output_type_object
         } else if opt_present(matches, ~"emit-llvm") {
-            link::output_type_bitcode
-        } else { link::output_type_exe };
+            linkage::output_type_bitcode
+        } else {
+            linkage::output_type_exe
+        };
     let extra_debuginfo = opt_present(matches, ~"xg");
     let debuginfo = opt_present(matches, ~"g") || extra_debuginfo;
     let sysroot_opt = getopts::opt_maybe_str(matches, ~"sysroot");
@@ -511,7 +513,8 @@ fn build_session_options(binary: ~str,
     let save_temps = getopts::opt_present(matches, ~"save-temps");
     match output_type {
       // unless we're emitting huamn-readable assembly, omit comments.
-      link::output_type_llvm_assembly | link::output_type_assembly => (),
+      linkage::output_type_llvm_assembly |
+      linkage::output_type_assembly => (),
       _ => debugging_opts |= session::no_asm_comments
     }
     let opt_level = {
@@ -657,18 +660,18 @@ fn build_output_filenames(input: input,
     let out_path;
     let sopts = sess.opts;
     let stop_after_codegen =
-        sopts.output_type != link::output_type_exe ||
+        sopts.output_type != linkage::output_type_exe ||
             sopts.static && sess.building_library;
 
 
     let obj_suffix =
         match sopts.output_type {
-          link::output_type_none => ~"none",
-          link::output_type_bitcode => ~"bc",
-          link::output_type_assembly => ~"s",
-          link::output_type_llvm_assembly => ~"ll",
+          linkage::output_type_none => ~"none",
+          linkage::output_type_bitcode => ~"bc",
+          linkage::output_type_assembly => ~"s",
+          linkage::output_type_llvm_assembly => ~"ll",
           // Object and exe output both use the '.o' extension here
-          link::output_type_object | link::output_type_exe => ~"o"
+          linkage::output_type_object | linkage::output_type_exe => ~"o"
         };
 
     match *ofile {
diff --git a/src/rustc/driver/session.rs b/src/rustc/driver/session.rs
index 70e717aa6d9..c4dde985bdb 100644
--- a/src/rustc/driver/session.rs
+++ b/src/rustc/driver/session.rs
@@ -6,7 +6,7 @@ use syntax::ast::{int_ty, uint_ty, float_ty};
 use syntax::parse::parse_sess;
 use metadata::filesearch;
 use back::target_strs;
-use back::link;
+use back::linkage;
 use middle::lint;
 
 
@@ -113,7 +113,7 @@ type options =
      lint_opts: ~[(lint::lint, lint::level)],
      save_temps: bool,
      jit: bool,
-     output_type: back::link::output_type,
+     output_type: back::linkage::output_type,
      addl_lib_search_paths: ~[Path],
      maybe_sysroot: Option<Path>,
      target_triple: ~str,
@@ -256,7 +256,7 @@ fn basic_options() -> @options {
         lint_opts: ~[],
         save_temps: false,
         jit: false,
-        output_type: link::output_type_exe,
+        output_type: linkage::output_type_exe,
         addl_lib_search_paths: ~[],
         maybe_sysroot: None,
         target_triple: driver::host_triple(),
diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs
index ef791cd5020..f72b4214abe 100644
--- a/src/rustc/middle/trans/base.rs
+++ b/src/rustc/middle/trans/base.rs
@@ -20,7 +20,7 @@ use std::map::{int_hash, str_hash};
 use driver::session;
 use session::session;
 use syntax::attr;
-use back::{link, abi, upcall};
+use back::{linkage, abi, upcall};
 use syntax::{ast, ast_util, codemap, ast_map};
 use ast_util::{local_def, path_to_ident};
 use syntax::visit;
@@ -32,7 +32,7 @@ use util::common::is_main_name;
 use lib::llvm::{llvm, mk_target_data, mk_type_names};
 use lib::llvm::{ModuleRef, ValueRef, TypeRef, BasicBlockRef};
 use lib::llvm::{True, False};
-use link::{mangle_internal_name_by_type_only,
+use linkage::{mangle_internal_name_by_type_only,
               mangle_internal_name_by_seq,
               mangle_internal_name_by_path,
               mangle_internal_name_by_path_and_seq,
@@ -2571,7 +2571,7 @@ fn trans_crate(sess: session::session,
 
     let symbol_hasher = @hash::default_state();
     let link_meta =
-        link::build_link_meta(sess, *crate, output, symbol_hasher);
+        linkage::build_link_meta(sess, *crate, output, symbol_hasher);
     let reachable = reachable::find_reachable(crate.node.module, emap, tcx,
                                               maps.method_map);
 
diff --git a/src/rustc/middle/trans/closure.rs b/src/rustc/middle/trans/closure.rs
index 1ba8e22607a..abc9cfecfd6 100644
--- a/src/rustc/middle/trans/closure.rs
+++ b/src/rustc/middle/trans/closure.rs
@@ -10,7 +10,7 @@ use type_of::*;
 use back::abi;
 use syntax::codemap::span;
 use syntax::print::pprust::expr_to_str;
-use back::link::{
+use back::linkage::{
     mangle_internal_name_by_path,
     mangle_internal_name_by_path_and_seq};
 use util::ppaux::ty_to_str;
diff --git a/src/rustc/middle/trans/common.rs b/src/rustc/middle/trans/common.rs
index b0ac8d920bc..f3fc4bfaa26 100644
--- a/src/rustc/middle/trans/common.rs
+++ b/src/rustc/middle/trans/common.rs
@@ -10,7 +10,7 @@ use syntax::{ast, ast_map};
 use driver::session;
 use session::session;
 use middle::ty;
-use back::{link, abi, upcall};
+use back::{linkage, abi, upcall};
 use syntax::codemap::span;
 use lib::llvm::{llvm, target_data, type_names, associate_type,
                    name_has_type};
diff --git a/src/rustc/middle/trans/controlflow.rs b/src/rustc/middle/trans/controlflow.rs
index 1affa18a683..7eda33fb2fb 100644
--- a/src/rustc/middle/trans/controlflow.rs
+++ b/src/rustc/middle/trans/controlflow.rs
@@ -165,7 +165,7 @@ fn trans_log(log_ex: @ast::expr,
     let global = if ccx.module_data.contains_key(modname) {
         ccx.module_data.get(modname)
     } else {
-        let s = link::mangle_internal_name_by_path_and_seq(
+        let s = linkage::mangle_internal_name_by_path_and_seq(
             ccx, modpath, ~"loglevel");
         let global = str::as_c_str(s, |buf| {
             llvm::LLVMAddGlobal(ccx.llmod, T_i32(), buf)
diff --git a/src/rustc/middle/trans/foreign.rs b/src/rustc/middle/trans/foreign.rs
index b97fa54588c..d267599095a 100644
--- a/src/rustc/middle/trans/foreign.rs
+++ b/src/rustc/middle/trans/foreign.rs
@@ -10,7 +10,7 @@ use lib::llvm::{ llvm, TypeRef, ValueRef, Integer, Pointer, Float, Double,
     StructRetAttribute, ByValAttribute,
     SequentiallyConsistent, Acquire, Release, Xchg };
 use syntax::{ast, ast_util};
-use back::{link, abi};
+use back::{linkage, abi};
 use common::*;
 use build::*;
 use base::*;
@@ -1007,7 +1007,7 @@ fn trans_foreign_fn(ccx: @crate_ctxt, path: ast_map::path, decl: ast::fn_decl,
                      id: ast::node_id) -> ValueRef {
         let _icx = ccx.insn_ctxt("foreign::foreign::build_rust_fn");
         let t = ty::node_id_to_type(ccx.tcx, id);
-        let ps = link::mangle_internal_name_by_path(
+        let ps = linkage::mangle_internal_name_by_path(
             ccx, vec::append_one(path, ast_map::path_name(
                 syntax::parse::token::special_idents::clownshoe_abi
             )));
@@ -1046,7 +1046,7 @@ fn trans_foreign_fn(ccx: @crate_ctxt, path: ast_map::path, decl: ast::fn_decl,
             // is wired directly into the return slot in the shim struct
         }
 
-        let shim_name = link::mangle_internal_name_by_path(
+        let shim_name = linkage::mangle_internal_name_by_path(
             ccx, vec::append_one(path, ast_map::path_name(
                 syntax::parse::token::special_idents::clownshoe_stack_shim
             )));
diff --git a/src/rustc/middle/trans/meth.rs b/src/rustc/middle/trans/meth.rs
index a87ae02f8d2..ddb79f8cd4a 100644
--- a/src/rustc/middle/trans/meth.rs
+++ b/src/rustc/middle/trans/meth.rs
@@ -8,7 +8,7 @@ use syntax::{ast, ast_map};
 use ast_map::{path, path_mod, path_name, node_id_to_str};
 use syntax::ast_util::local_def;
 use metadata::csearch;
-use back::{link, abi};
+use back::abi;
 use lib::llvm::llvm;
 use lib::llvm::{ValueRef, TypeRef};
 use lib::llvm::llvm::LLVMGetParam;
diff --git a/src/rustc/middle/trans/monomorphize.rs b/src/rustc/middle/trans/monomorphize.rs
index 243b0b96fa3..239988c06e5 100644
--- a/src/rustc/middle/trans/monomorphize.rs
+++ b/src/rustc/middle/trans/monomorphize.rs
@@ -9,7 +9,7 @@ use base::{trans_item, get_item_val, no_self, self_arg, trans_fn,
               get_insn_ctxt};
 use syntax::parse::token::special_idents;
 use type_of::type_of_fn_from_ty;
-use back::link::mangle_exported_name;
+use back::linkage::mangle_exported_name;
 use middle::ty::{FnTyBase, FnMeta, FnSig};
 
 fn monomorphic_fn(ccx: @crate_ctxt,
diff --git a/src/rustc/rustc.rc b/src/rustc/rustc.rc
index 501192d3ced..46b2ff1fa50 100644
--- a/src/rustc/rustc.rc
+++ b/src/rustc/rustc.rc
@@ -121,7 +121,7 @@ mod front {
 }
 
 mod back {
-    mod link;
+    mod linkage;
     mod abi;
     mod upcall;
     mod x86;