Bail out early during ambiguous unification

aturon · aturon · commit d23662613734 · 2017-06-06T17:36:52.000-07:00
diff --git a/src/solve/infer/unify.rs b/src/solve/infer/unify.rs
@@ -116,6 +116,7 @@ impl<'t> Unifier<'t> {
                 if apply1.name != apply2.name {
                     if apply1.name.is_for_all() || apply2.name.is_for_all() {
                         self.ambiguous = true;
+                        return Ok(());
                     } else {
                         bail!("cannot equate `{:?}` and `{:?}`", apply1.name, apply2.name);
                     }

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ impl<'t> Unifier<'t> {`
`116`	`116`	`if apply1.name != apply2.name {`
`117`	`117`	`if apply1.name.is_for_all() \|\| apply2.name.is_for_all() {`
`118`	`118`	`self.ambiguous = true;`
	`119`	`+ return Ok(());`
`119`	`120`	`} else {`
`120`	`121`	bail!("cannot equate `{:?}` and `{:?}`", apply1.name, apply2.name);
`121`	`122`	`}`