---

yaml
---
r: 276511
b: refs/heads/try
c: 726ba66
h: refs/heads/master
i:
  276509: 9451de5
  276507: 45ccfbe
  276503: 76b5fcf
  276495: 7b1319e
  276479: 1837f60

Author: nikomatsakis

[refs]

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

branches/try/src/librustc_trans/back/symbol_names.rs

@@ -190,10 +190,10 @@ fn exported_name_with_opt_suffix<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
                                            instance: &Instance<'tcx>,
                                            suffix: Option<&str>)
                                            -> String {
-    let &Instance { def: mut def_id, params: parameters } = instance;
+    let &Instance { def: mut def_id, ref substs } = instance;
 
-    debug!("exported_name_with_opt_suffix(def_id={:?}, parameters={:?}, suffix={:?})",
-           def_id, parameters, suffix);
+    debug!("exported_name_with_opt_suffix(def_id={:?}, substs={:?}, suffix={:?})",
+           def_id, substs, suffix);
 
     if let Some(node_id) = ccx.tcx().map.as_local_node_id(def_id) {
         if let Some(&src_def_id) = ccx.external_srcs().borrow().get(&node_id) {
@@ -234,7 +234,7 @@ fn exported_name_with_opt_suffix<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
     // and should not matter anyhow.
     let instance_ty = ccx.tcx().erase_regions(&instance_ty.ty);
 
-    let hash = get_symbol_hash(ccx, &def_path, instance_ty, parameters.as_slice());
+    let hash = get_symbol_hash(ccx, &def_path, instance_ty, substs.types.as_slice());
 
     let mut buffer = SymbolPathBuffer {
         names: Vec::with_capacity(def_path.data.len())