bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove branch with has_metadata

Browse source
This commit is contained in:
Maik Klein 2017-11-23 11:04:31 +01:00 • committed by Ariel Ben-Yehuda
parent ab0f8fcdac
commit 6e94a7a91e
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustc_mir/monomorphize/collector.rs
View file

@ -789,12 +789,9 @@ fn find_vtable_types_for_unsizing<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
target_ty: Ty<'tcx>) target_ty: Ty<'tcx>)
-> (Ty<'tcx>, Ty<'tcx>) { -> (Ty<'tcx>, Ty<'tcx>) {
let ptr_vtable = |inner_source: Ty<'tcx>, inner_target: Ty<'tcx>| { let ptr_vtable = |inner_source: Ty<'tcx>, inner_target: Ty<'tcx>| {
if inner_source.has_metadata(tcx) { tcx.struct_lockstep_tails(inner_source, inner_target)
(inner_source, inner_target)
} else {
tcx.struct_lockstep_tails(inner_source, inner_target)
}
}; };
match (&source_ty.sty, &target_ty.sty) { match (&source_ty.sty, &target_ty.sty) {
(&ty::TyRef(_, ty::TypeAndMut { ty: a, .. }), (&ty::TyRef(_, ty::TypeAndMut { ty: a, .. }),
&ty::TyRef(_, ty::TypeAndMut { ty: b, .. })) | &ty::TyRef(_, ty::TypeAndMut { ty: b, .. })) |