---

yaml
---
r: 276479
b: refs/heads/try
c: 8ef638e
h: refs/heads/master
i:
  276477: 9ea6d23
  276475: ef2d90a
  276471: 18652fd
  276463: 299b252
  276447: e3f0fa4
  276415: 360e4f4
  276351: a8307a2
  276223: 6479ec1
  275967: 88cb670
  275455: a9a7111
  274431: c19f067

Author: michaelwoerister

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: 23e54b24adad2c04c1080a7c3d54611452c5232f
+refs/heads/try: 8ef638e6fa0eccc0c7ce3d28555cc14c0ddf10f7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_trans/trans/closure.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use arena::TypedArena;
-use back::{link, symbol_names};
+use back::symbol_names;
 use llvm::{ValueRef, get_param, get_params};
 use middle::def_id::DefId;
 use middle::infer;
@@ -382,7 +382,8 @@ fn trans_fn_once_adapter_shim<'a, 'tcx>(
     });
 
     // Create the by-value helper.
-    let function_name = link::mangle_internal_name_by_type_and_seq(ccx, llonce_fn_ty, "once_shim");
+    let function_name =
+        symbol_names::internal_name_from_type_and_suffix(ccx, llonce_fn_ty, "once_shim");
     let lloncefn = declare::define_internal_fn(ccx, &function_name, llonce_fn_ty);
 
     let (block_arena, fcx): (TypedArena<_>, FunctionContext);