Commit 9f05da7

committed

Preserve variance on error in generalizer

1 parent 6bdb8a4 commit 9f05da7Copy full SHA for 9f05da7

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -404,9 +404,9 @@ impl<'tcx> TypeRelation<'tcx> for Generalizer<'_, 'tcx> {`
`404`	`404`	`debug!(?self.ambient_variance, "new ambient variance");`
`405`	`405`	// Recursive calls to `relate` can overflow the stack. For example a deeper version of
`406`	`406`	// `ui/associated-consts/issue-93775.rs`.
`407`		`- let r = ensure_sufficient_stack(\|\| self.relate(a, b))?;`
	`407`	`+ let r = ensure_sufficient_stack(\|\| self.relate(a, b));`
`408`	`408`	`self.ambient_variance = old_ambient_variance;`
`409`		`- Ok(r)`
	`409`	`+ r`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`#[instrument(level = "debug", skip(self, t2), ret)]`

Comments

(0)