Minor review adjustments

Author: ccasin

ocaml/testsuite/tests/typing-modules/package_constraint.ml

@@ -221,31 +221,6 @@ module F :
     sig module M : sig type t = int end type t = M.t end
 |}];;
 
-(* In cases where the package constraint involves a type variable from the
-   current ty var env, it can affect inference.  t1 below should check but not
-   t2. *)
-module type S = sig
-  type t : immediate
-end
-
-type 'a t = (module S with type t = 'a)
-
-type t1 = int t
-type t2 = string t
-[%%expect{|
-module type S = sig type t : immediate end
-type ('a : immediate) t = (module S with type t = 'a)
-type t1 = int t
-Line 8, characters 10-16:
-8 | type t2 = string t
-              ^^^^^^
-Error: This type string should be an instance of type ('a : immediate)
-       The layout of string is value, because
-         it is the primitive value type string.
-       But the layout of string must be a sublayout of immediate, because
-         of the definition of t at line 5, characters 0-39.
-|}];;
-
 (* Checking such a constraint may require expanding definitions from the module
    being updated. *)
 module type S = sig
@@ -330,3 +305,28 @@ Line 1, characters 13-61:
 Error: In the constrained signature, type t is defined to be [< `A ].
        Package `with' constraints may only be used on abstract types.
 |}]
+
+(* In cases where the package constraint involves a type variable from the
+   current ty var env, it can affect inference.  t1 below should check but not
+   t2. *)
+module type S = sig
+  type t : immediate
+end
+
+type 'a t = (module S with type t = 'a)
+
+type t1 = int t
+type t2 = string t
+[%%expect{|
+module type S = sig type t : immediate end
+type ('a : immediate) t = (module S with type t = 'a)
+type t1 = int t
+Line 8, characters 10-16:
+8 | type t2 = string t
+              ^^^^^^
+Error: This type string should be an instance of type ('a : immediate)
+       The layout of string is value, because
+         it is the primitive value type string.
+       But the layout of string must be a sublayout of immediate, because
+         of the definition of t at line 5, characters 0-39.
+|}];;

ocaml/typing/printtyp.ml

@@ -622,6 +622,10 @@ and labeled_type ppf (label, ty) =
 
 and raw_type_list tl = raw_list raw_type tl
 and labeled_type_list tl = raw_list labeled_type tl
+and raw_lid_type_list tl =
+  raw_list (fun ppf (lid, typ) ->
+             fprintf ppf "(@,%a,@,%a)" longident lid raw_type typ)
+    tl
 and raw_type_desc ppf = function
     Tvar { name; jkind } ->
       fprintf ppf "Tvar (@,%a,@,%s)" print_name name
@@ -678,8 +682,8 @@ and raw_type_desc ppf = function
           | Some(p,tl) ->
               fprintf ppf "Some(@,%a,@,%a)" path p raw_type_list tl)
   | Tpackage (p, fl) ->
-      fprintf ppf "@[<hov1>Tpackage(@,%a@,%a)@]" path p
-        raw_type_list (List.map snd fl)
+      fprintf ppf "@[<hov1>Tpackage(@,%a,@,%a)@]" path p
+        raw_lid_type_list fl
 and raw_row_fixed ppf = function
 | None -> fprintf ppf "None"
 | Some Types.Fixed_private -> fprintf ppf "Some Fixed_private"