Commit 8fa8f40

committed

Structurally resolve before adjust_for_branches

1 parent da0380b commit 8fa8f40Copy full SHA for 8fa8f40

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`57`	`57`	`// type in that case)`
`58`	`58`	`let mut all_arms_diverge = Diverges::WarnedAlways;`
`59`	`59`
`60`		`- let expected = orig_expected.adjust_for_branches(self);`
	`60`	`+ let expected = orig_expected.adjust_for_branches(self, expr.span);`
`61`	`61`	`debug!(?expected);`
`62`	`62`
`63`	`63`	`let mut coercion = {`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,14 @@ impl<'a, 'tcx> Expectation<'tcx> {`
`39`	`39`	`// an expected type. Otherwise, we might write parts of the type`
`40`	`40`	`// when checking the 'then' block which are incompatible with the`
`41`	`41`	`// 'else' branch.`
`42`		`- pub(super) fn adjust_for_branches(&self, fcx: &FnCtxt<'a, 'tcx>) -> Expectation<'tcx> {`
	`42`	`+ pub(super) fn adjust_for_branches(`
	`43`	`+ &self,`
	`44`	`+ fcx: &FnCtxt<'a, 'tcx>,`
	`45`	`+ span: Span,`
	`46`	`+ ) -> Expectation<'tcx> {`
`43`	`47`	`match *self {`
`44`	`48`	`ExpectHasType(ety) => {`
`45`		`- let ety = fcx.shallow_resolve(ety);`
	`49`	`+ let ety = fcx.try_structurally_resolve_type(span,ety);`
`46`	`50`	`if !ety.is_ty_var() { ExpectHasType(ety) } else { NoExpectation }`
`47`	`51`	`}`
`48`	`52`	`ExpectRvalueLikeUnsized(ety) => ExpectRvalueLikeUnsized(ety),`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1294,7 +1294,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`1294`	`1294`	`let cond_diverges = self.diverges.get();`
`1295`	`1295`	`self.diverges.set(Diverges::Maybe);`
`1296`	`1296`
`1297`		`- let expected = orig_expected.adjust_for_branches(self);`
	`1297`	`+ let expected = orig_expected.adjust_for_branches(self, sp);`
`1298`	`1298`	`let then_ty = self.check_expr_with_expectation(then_expr, expected);`
`1299`	`1299`	`let then_diverges = self.diverges.get();`
`1300`	`1300`	`self.diverges.set(Diverges::Maybe);`

Comments

(0)