bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustup

Browse source
This commit is contained in:
Oliver Schneider 2016-12-06 15:41:28 +01:00 • committed by Scott Olson
parent b96202b3cd
commit c076321a94
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/interpreter/mod.rs
View file

@ -1798,7 +1798,7 @@ impl IntegerExt for layout::Integer {
} }
pub fn monomorphize_field_ty<'a, 'tcx:'a >(tcx: TyCtxt<'a, 'tcx, 'tcx>, f: ty::FieldDef<'tcx>, substs: &'tcx Substs<'tcx>) -> Ty<'tcx> { pub fn monomorphize_field_ty<'a, 'tcx:'a >(tcx: TyCtxt<'a, 'tcx, 'tcx>, f: &ty::FieldDef, substs: &'tcx Substs<'tcx>) -> Ty<'tcx> {
let substituted = &f.ty(tcx, substs); let substituted = &f.ty(tcx, substs);
tcx.normalize_associated_type(&substituted) tcx.normalize_associated_type(&substituted)
} }

4
src/interpreter/terminator/intrinsics.rs
View file

@ -489,8 +489,8 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
fn field_ty( fn field_ty(
&self, &self,
param_substs: &Substs<'tcx>, param_substs: &Substs<'tcx>,
f: ty::FieldDef<'tcx>, f: &ty::FieldDef,
)-> ty::Ty<'tcx> { ) -> ty::Ty<'tcx> {
self.tcx.normalize_associated_type(&f.ty(self.tcx, param_substs)) self.tcx.normalize_associated_type(&f.ty(self.tcx, param_substs))
} }
} }