Merge branch 'trunk' into nick-get-copy

1 files changed, 24 insertions, 1 deletions

diff --git a/testsuite/tests/typing-misc/typetexp_errors.ml b/testsuite/tests/typing-misc/typetexp_errors.ml
index 986d858586..4f71bd478b 100644
--- a/testsuite/tests/typing-misc/typetexp_errors.ml
+++ b/testsuite/tests/typing-misc/typetexp_errors.ml
@@ -1,5 +1,5 @@
 (* TEST
-   * expect
+ expect;
 *)
 
 type ('a,'at,'any,'en) t = A of 'an
@@ -31,3 +31,26 @@ Line 1, characters 6-9:
           ^^^
 Error: The type variable name '_a is not allowed in programs
 |}]
+
+(* The next two hit the unification error case at the end of
+   Typetexp.globalize_used_variables. *)
+let f (x: int as 'a) (y: float as 'a) = (x,y)
+[%%expect{|
+Line 1, characters 25-36:
+1 | let f (x: int as 'a) (y: float as 'a) = (x,y)
+                             ^^^^^^^^^^^
+Error: This type float should be an instance of type int
+|}]
+
+type 'a t1 = 'a constraint 'a = 'b list
+type 'a t2 = 'a constraint 'a = 'b option
+
+let f (x : 'a t1) = (assert false : 'a t2)
+[%%expect{|
+type 'a t1 = 'a constraint 'a = 'b list
+type 'a t2 = 'a constraint 'a = 'b option
+Line 4, characters 36-38:
+4 | let f (x : 'a t1) = (assert false : 'a t2)
+                                        ^^
+Error: This type 'a option should be an instance of type 'b list
+|}]