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

7 files changed, 11 insertions, 11 deletions

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,