Commit 27da982

committed

Fix generalizer bug

1 parent f5631bf commit 27da982Copy full SHA for 27da982

File tree

-16

lines changed

-16

lines changed

Lines changed: 3 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,16 +108,11 @@ impl<'tcx> InferCtxt<'tcx> {`
`108`	`108`	`} else {`
`109`	`109`	// HACK: make sure that we `a_is_expected` continues to be
`110`	`110`	`// correct when relating the generalized type with the source.`
`111`		`- if target_is_expected == relation.a_is_expected() {`
`112`		`- relation.relate_with_variance(`
`113`		`- ambient_variance,`
`114`		`- ty::VarianceDiagInfo::default(),`
`115`		`- generalized_ty,`
`116`		`- source_ty,`
`117`		`- )?;`
	`111`	`+ if target_is_expected {`
	`112`	`+ relation.relate(generalized_ty, source_ty)?;`
`118`	`113`	`} else {`
`119`	`114`	`relation.relate_with_variance(`
`120`		`- ambient_variance.xform(ty::Contravariant),`
	`115`	`+ ty::Contravariant,`
`121`	`116`	`ty::VarianceDiagInfo::default(),`
`122`	`117`	`source_ty,`
`123`	`118`	`generalized_ty,`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,18 +125,12 @@ impl<'tcx> TypeRelation<'tcx> for TypeRelating<'_, '_, 'tcx> {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`(&ty::Infer(TyVar(a_vid)), _) => {`
`128`		`- infcx.instantiate_ty_var(`
`129`		`- self,`
`130`		`- self.a_is_expected,`
`131`		`- a_vid,`
`132`		`- self.ambient_variance,`
`133`		`- b,`
`134`		`- )?;`
	`128`	`+ infcx.instantiate_ty_var(self, true, a_vid, self.ambient_variance, b)?;`
`135`	`129`	`}`
`136`	`130`	`(_, &ty::Infer(TyVar(b_vid))) => {`
`137`	`131`	`infcx.instantiate_ty_var(`
`138`	`132`	`self,`
`139`		`- !self.a_is_expected,`
	`133`	`+ false,`
`140`	`134`	`b_vid,`
`141`	`135`	`self.ambient_variance.xform(ty::Contravariant),`
`142`	`136`	`a,`

Comments

(0)