diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2017-10-20 11:09:14 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2017-10-20 11:09:14 +0200 |
| commit | d70a662da07aeeab9dc11544200864e402c0a9b5 (patch) | |
| tree | 4cd8c386460a7cf21deb3803586840309e3c8149 /kernel | |
| parent | 90f29219c38bc3b1bf68f1139dfdde9dd2157500 (diff) | |
| parent | 82134deb1207e8954fe4e46d627d5f587101e2e8 (diff) | |
Merge PR #1155: Use type nonrec in some functor arguments.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/names.ml | 9 | ||||
| -rw-r--r-- | kernel/univ.ml | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/kernel/names.ml b/kernel/names.ml index e524f4258..cb27104d1 100644 --- a/kernel/names.ml +++ b/kernel/names.ml @@ -113,8 +113,7 @@ struct module Self_Hashcons = struct - type _t = t - type t = _t + type nonrec t = t type u = Id.t -> Id.t let hashcons hident = function | Name id -> Name (hident id) @@ -236,8 +235,7 @@ struct module Self_Hashcons = struct - type _t = t - type t = _t + type nonrec t = t type u = (Id.t -> Id.t) * (DirPath.t -> DirPath.t) let hashcons (hid,hdir) (n,s,dir) = (n,hid s,hdir dir) let eq ((n1,s1,dir1) as x) ((n2,s2,dir2) as y) = @@ -869,8 +867,7 @@ struct module Self_Hashcons = struct - type _t = t - type t = _t + type nonrec t = t type u = Constant.t -> Constant.t let hashcons hc (c,b) = (hc c,b) let eq ((c,b) as x) ((c',b') as y) = diff --git a/kernel/univ.ml b/kernel/univ.ml index bae782f5d..7fe4f8274 100644 --- a/kernel/univ.ml +++ b/kernel/univ.ml @@ -121,8 +121,7 @@ module Level = struct (** Hashcons on levels + their hash *) module Self = struct - type _t = t - type t = _t + type nonrec t = t type u = unit let eq x y = x.hash == y.hash && RawLevel.hequal x.data y.data let hash x = x.hash @@ -755,8 +754,7 @@ struct module HInstancestruct = struct - type _t = t - type t = _t + type nonrec t = t type u = Level.t -> Level.t let hashcons huniv a = |