test: avoid creating abstract module type by shadowing

Octachron · Octachron · commit eb5c6e5877ab · 2025-06-24T15:04:56.000+02:00
OCaml 5.4 forbids the creation of abstract module types
because the creation of such module types never match
the user intents.
diff --git a/test/xref2/shadow2.t/a.mli b/test/xref2/shadow2.t/a.mli
@@ -6,7 +6,7 @@ end
 
 include B1
 
-module type B2 = sig
+module type B2 := sig
   module A : sig
     include module type of struct include A end
     type u
@@ -15,7 +15,7 @@ end
 
 include B2
 
-module type B3 = sig
+module type B3 := sig
   module A : sig
     include module type of struct include A end
     type v
diff --git a/test/xref2/shadow2.t/run.t b/test/xref2/shadow2.t/run.t
@@ -7,7 +7,7 @@
   
   include B1
   
-  module type B2 = sig
+  module type B2 := sig
     module A : sig
       include module type of struct include A end
       type u
@@ -16,7 +16,7 @@
   
   include B2
   
-  module type B3 = sig
+  module type B3 := sig
     module A : sig
       include module type of struct include A end
       type v
diff --git a/test/xref2/shadow3.t/a.mli b/test/xref2/shadow3.t/a.mli
@@ -6,7 +6,7 @@ end
 
 include B
 
-module type B1 = sig
+module type B1 := sig
   module A : sig
     include module type of struct include A end
     type a
diff --git a/test/xref2/shadow3.t/b.mli b/test/xref2/shadow3.t/b.mli
@@ -6,7 +6,7 @@ end
 
 include B
 
-module type B1 = sig
+module type B1 := sig
   module A : sig
     include module type of struct include A end
     type b
diff --git a/test/xref2/shadow3.t/run.t b/test/xref2/shadow3.t/run.t
@@ -6,7 +6,6 @@ Module `C` then includes them both, causing further shadowing.
   $ ocamlc -c -bin-annot c.mli
   $ ocamlc -i c.mli
   module type B = B.B
-  module type B1 = B.B1
   module A : sig type t = B.A.t type b = B.A.b end
 
   $ odoc compile a.cmti --unique-id AAAA
@@ -19,23 +18,46 @@ Module `C` then includes them both, causing further shadowing.
       module type {B}1/shadowed/(CCCC) = A.B
       include {B}1/shadowed/(CCCC)
         (sig : module {A}1/shadowed/(AAAA) = A.A end)
-      module type {B1}2/shadowed/(CCCC) = A.B1
-      include {B1}2/shadowed/(CCCC)
-        (sig : module {A}3/shadowed/(CCCC) = A.A end)
+      module type B1 := 
+        sig
+          module A : 
+            sig
+              include module type of struct include {A}1/shadowed/(AAAA) end
+                (sig :
+                  include module type of struct include A.{A}1/shadowed/(AAAA) end
+                    (sig : type t = {A}1/shadowed/(AAAA).t end)
+                  type a = A.A.a
+                 end)
+              type a
+            end
+        end
+      include B1 (sig : module {A}2/shadowed/(CCCC) = A.A end)
      end)
   include module type of struct include B end
     (sig :
       module type B = B.B
       include B (sig : module {A}1/shadowed/(BBBB) = B.A end)
-      module type B1 = B.B1
-      include B1 (sig : module {A}4/shadowed/(CCCC) = B.A end)
+      module type B1 := 
+        sig
+          module A : 
+            sig
+              include module type of struct include {A}1/shadowed/(BBBB) end
+                (sig :
+                  include module type of struct include B.{A}1/shadowed/(BBBB) end
+                    (sig : type t = {A}1/shadowed/(BBBB).t end)
+                  type b = B.A.b
+                 end)
+              type b
+            end
+        end
+      include B1 (sig : module {A}3/shadowed/(CCCC) = B.A end)
      end)
   module A : 
     sig
-      include module type of struct include {A}4/shadowed/(CCCC) end
+      include module type of struct include {A}3/shadowed/(CCCC) end
         (sig :
           include module type of struct include B.{A}1/shadowed/(BBBB) end
-            (sig : type t = {A}4/shadowed/(CCCC).t end)
+            (sig : type t = {A}3/shadowed/(CCCC).t end)
           type b = B.A.b
          end)
     end
