From b96442cd01c90c70997d0aa2995152a96dcd1f36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Gilbert?= Date: Mon, 27 May 2024 14:53:30 +0200 Subject: [PATCH] Adapt to coq/coq#19078 (different module type for unordered maps) --- serlib/ser_cMap.ml | 4 ++-- serlib/ser_cMap.mli | 4 ++-- serlib/ser_cSet.ml | 4 ++-- serlib/ser_cSet.mli | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/serlib/ser_cMap.ml b/serlib/ser_cMap.ml index e6ece6a3..56000f9a 100644 --- a/serlib/ser_cMap.ml +++ b/serlib/ser_cMap.ml @@ -22,7 +22,7 @@ open Ppx_compare_lib.Builtin module type ExtS = sig - include CSig.MapS + include CSig.UMapS (* module SSet : Ser_cSet.ExtS *) @@ -30,7 +30,7 @@ module type ExtS = sig end -module Make (M : CSig.MapS) (S : SerType.SJHC with type t = M.key) = struct +module Make (M : CSig.UMapS) (S : SerType.SJHC with type t = M.key) = struct include M diff --git a/serlib/ser_cMap.mli b/serlib/ser_cMap.mli index 6fa89e8b..7f7bd948 100644 --- a/serlib/ser_cMap.mli +++ b/serlib/ser_cMap.mli @@ -18,13 +18,13 @@ module type ExtS = sig - include CSig.MapS + include CSig.UMapS include SerType.SJHC1 with type 'a t := 'a t end -module Make (M : CSig.MapS) (S : SerType.SJHC with type t = M.key) +module Make (M : CSig.UMapS) (S : SerType.SJHC with type t = M.key) : ExtS with type key = M.key and type 'a t = 'a M.t diff --git a/serlib/ser_cSet.ml b/serlib/ser_cSet.ml index 29d83883..072e65a0 100644 --- a/serlib/ser_cSet.ml +++ b/serlib/ser_cSet.ml @@ -22,13 +22,13 @@ open Ppx_compare_lib.Builtin module type ExtS = sig - include CSig.SetS + include CSig.USetS include SerType.SJHC with type t := t end -module Make (M : CSig.SetS) (S : SerType.SJHC with type t = M.elt) = struct +module Make (M : CSig.USetS) (S : SerType.SJHC with type t = M.elt) = struct include M diff --git a/serlib/ser_cSet.mli b/serlib/ser_cSet.mli index ce0e381a..52c16996 100644 --- a/serlib/ser_cSet.mli +++ b/serlib/ser_cSet.mli @@ -18,13 +18,13 @@ module type ExtS = sig - include CSig.SetS + include CSig.USetS include SerType.SJHC with type t := t end -module Make (M : CSig.SetS) (S : SerType.SJHC with type t = M.elt) +module Make (M : CSig.USetS) (S : SerType.SJHC with type t = M.elt) : ExtS with type t = M.t and type elt = M.elt