summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo White <lpw25@cl.cam.ac.uk>2016-10-06 12:09:26 +0100
committerLeo White <lpw25@cl.cam.ac.uk>2016-10-06 12:09:26 +0100
commit7512cb97a0684cae3d63ec200ed6a9e9f29fb371 (patch)
treedb3c85fb148a44b9804053a49b319a63e0549efb
parenta2d97eccac31b4bcea57021b107bfddba72f363c (diff)
parentb1c603737d736b6f4ce8b51ea7a785a1d7795cfc (diff)
downloadocaml-4.03.0-3.tar.gz
Merge branch 'patch/fix-alias-coercions' into 4.03.0+vanilla4.03.0-3
-rw-r--r--testsuite/tests/typing-modules/aliases.ml15
-rw-r--r--testsuite/tests/typing-modules/aliases.ml.reference3
2 files changed, 0 insertions, 18 deletions
diff --git a/testsuite/tests/typing-modules/aliases.ml b/testsuite/tests/typing-modules/aliases.ml
index 1c36d96fc1..1bb18509fd 100644
--- a/testsuite/tests/typing-modules/aliases.ml
+++ b/testsuite/tests/typing-modules/aliases.ml
@@ -236,21 +236,6 @@ module R = struct
end;;
module R' : S = R;;
-module F (X : sig end) = struct type t end;;
-module M : sig
- type a
- module Foo : sig
- module Bar : sig end
- type b = a
- end
-end = struct
- module Foo = struct
- module Bar = struct end
- type b = F(Bar).t
- end
- type a = Foo.b
-end;;
-
(* PR#6578 *)
module M = struct let f x = x end
diff --git a/testsuite/tests/typing-modules/aliases.ml.reference b/testsuite/tests/typing-modules/aliases.ml.reference
index 636cb938e7..99404ebcc5 100644
--- a/testsuite/tests/typing-modules/aliases.ml.reference
+++ b/testsuite/tests/typing-modules/aliases.ml.reference
@@ -394,9 +394,6 @@ module K : sig module E = B module N = E.O end
module Q = M
end
# module R' : S
-# module F : functor (X : sig end) -> sig type t end
-# module M :
- sig type a module Foo : sig module Bar : sig end type b = a end end
# module M : sig val f : 'a -> 'a end
module rec R : sig module M : sig val f : 'a -> 'a end end
# - : int = 3