improve compatibility with the stdlib

src/core/CCMap.ml

@@ -6,6 +6,8 @@
 type 'a sequence = ('a -> unit) -> unit
 type 'a printer = Format.formatter -> 'a -> unit
 
+module type OrderedType = Map.OrderedType
+
 module type S = sig
   include Map.S
 

src/core/CCMap.mli

@@ -9,6 +9,9 @@
 type 'a sequence = ('a -> unit) -> unit
 type 'a printer = Format.formatter -> 'a -> unit
 
+module type OrderedType = Map.OrderedType
+(** @since NEXT_RELEASE *)
+
 module type S = sig
   include Map.S
 

src/core/CCResult.ml

@@ -10,6 +10,8 @@ type 'a printer = Format.formatter -> 'a -> unit
 
 (** {2 Basics} *)
 
+include Result
+
 type (+'good, +'bad) t = ('good, 'bad) Result.result =
   | Ok of 'good
   | Error of 'bad

src/core/CCResult.mli

@@ -14,6 +14,9 @@ type 'a printer = Format.formatter -> 'a -> unit
 
 (** {2 Basics} *)
 
+include module type of Result
+(** @since NEXT_RELEASE *)
+
 type (+'good, +'bad) t = ('good, 'bad) Result.result =
   | Ok of 'good
   | Error of 'bad

src/core/CCSet.ml

@@ -6,6 +6,8 @@
 type 'a sequence = ('a -> unit) -> unit
 type 'a printer = Format.formatter -> 'a -> unit
 
+module type OrderedType = Set.OrderedType
+
 module type S = sig
   include Set.S
 

src/core/CCSet.mli

@@ -8,6 +8,9 @@
 type 'a sequence = ('a -> unit) -> unit
 type 'a printer = Format.formatter -> 'a -> unit
 
+module type OrderedType = Set.OrderedType
+(** @since NEXT_RELEASE *)
+
 module type S = sig
   include Set.S
 

src/core/containers.ml

@@ -7,21 +7,12 @@ module Array = CCArray
 module ArrayLabels = CCArrayLabels
 module Array_slice = CCArray_slice
 module Bool = CCBool
-module Char = struct
-  include Char
-  include (CCChar : module type of CCChar with type t := t)
-end
+module Char = Char
 module Equal = CCEqual
 module Float = CCFloat
-module Format = struct
-  include Format
-  include CCFormat
-end
+module Format = CCFormat
 module Fun = CCFun
 module Hash = CCHash
-module Int = CCInt
-module Int64 = CCInt64
-module IO = CCIO
 
 (** @since 0.14 *)
 module Hashtbl = struct
@@ -35,25 +26,19 @@ module Hashtbl = struct
   module Make' = CCHashtbl.Make
 end
 module Heap = CCHeap
+module Int = CCInt
+module Int64 = CCInt64
+module IO = CCIO
 module List = CCList
 module ListLabels = CCListLabels
-module Map = struct
-  module type OrderedType = Map.OrderedType
-  include CCMap
-end
+module Map = CCMap
 module Option = CCOpt
 module Ord = CCOrd
 module Pair = CCPair
 module Parse = CCParse
 module Random = CCRandom
 module Ref = CCRef
-module Result = struct
-  include Result
-  include CCResult
-end
-module Set = struct
-  module type OrderedType = Set.OrderedType
-  include CCSet
-end
+module Result = CCResult
+module Set = CCSet
 module String = CCString
 module Vector = CCVector