OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rebase over my PR

This commit is contained in:
Niko Matsakis 2016-03-25 14:36:49 -04:00
parent 8a7b1bca04
commit 726ba6630d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc_trans/back/symbol_names.rs
View File

@ -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())