---

yaml
---
r: 273559
b: refs/heads/beta
c: 23e54b2
h: refs/heads/master
i:
  273557: 43864a6
  273555: 7e30a14
  273551: c7cf30e

Author: michaelwoerister

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 7a5a98857965830dc0c2f58d853f3abc813f7dd7
+refs/heads/beta: 23e54b24adad2c04c1080a7c3d54611452c5232f
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_trans/trans/callee.rs

@@ -18,7 +18,7 @@ pub use self::CalleeData::*;
 pub use self::CallArgs::*;
 
 use arena::TypedArena;
-use back::link;
+use back::symbol_names;
 use llvm::{self, ValueRef, get_params};
 use middle::cstore::LOCAL_CRATE;
 use middle::def_id::DefId;
@@ -378,8 +378,10 @@ pub fn trans_fn_pointer_shim<'a, 'tcx>(
     debug!("tuple_fn_ty: {:?}", tuple_fn_ty);
 
     //
-    let function_name = link::mangle_internal_name_by_type_and_seq(ccx, bare_fn_ty,
-                                                                   "fn_pointer_shim");
+    let function_name =
+        symbol_names::internal_name_from_type_and_suffix(ccx,
+                                                         bare_fn_ty,
+                                                         "fn_pointer_shim");
     let llfn = declare::define_internal_fn(ccx, &function_name, tuple_fn_ty);
 
     //