Skip to content

Commit

Permalink
Merge pull request #412 from SkySkimmer/csig-umap
Browse files Browse the repository at this point in the history
Adapt to coq/coq#19078 (different module type for unordered maps)
  • Loading branch information
SkySkimmer authored May 29, 2024
2 parents cfa66f2 + b96442c commit 9f1cd45
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions serlib/ser_cMap.ml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ open Ppx_compare_lib.Builtin

module type ExtS = sig

include CSig.MapS
include CSig.UMapS

(* module SSet : Ser_cSet.ExtS *)

include SerType.SJHC1 with type 'a t := 'a t

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

Expand Down
4 changes: 2 additions & 2 deletions serlib/ser_cMap.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions serlib/ser_cSet.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions serlib/ser_cSet.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9f1cd45

Please sign in to comment.