user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix rebase

Browse source
This commit is contained in:
Vadim Petrochenkov 2015-10-04 13:11:56 +03:00
parent b404ded15b
commit f4e3851aa7
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc_typeck/collect.rs
View file

@ -1125,8 +1125,11 @@ fn convert_struct_def<'tcx>(tcx: &ty::ctxt<'tcx>,
{
let did = tcx.map.local_def_id(it.id);
let ctor_id = def.ctor_id.map_or(did,
|ctor_id| tcx.map.local_def_id(ctor_id));
let ctor_id = if def.kind != hir::VariantKind::Dict {
tcx.map.local_def_id(def.id)
} else {
did
};
tcx.intern_adt_def(
did,
ty::AdtKind::Struct,
@ -1208,7 +1211,7 @@ fn convert_enum_def<'tcx>(tcx: &ty::ctxt<'tcx>,
{
let did = tcx.map.local_def_id(v.node.def.id);
let name = v.node.name;
convert_struct_variant(tcx, did, name, disr, &v.node.def)
convert_struct_variant(tcx, did, name, disr, &v.node.def, did)
}
let did = tcx.map.local_def_id(it.id);
let repr_hints = tcx.lookup_repr_hints(did);