diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index ee38ca6d..f7f90225 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -1,5 +1,9 @@ = Changelog +== 1.5.1 + +- re-export `Format` types and functions in `CCFormat` + == 1.5 - have `CCList.{get,insert,set}_at_idx` work with negative indices diff --git a/_oasis b/_oasis index 87c1568f..b3eaedcf 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: containers -Version: 1.5 +Version: 1.5.2 Homepage: https://github.com/c-cube/ocaml-containers Authors: Simon Cruanes License: BSD-2-clause diff --git a/opam b/opam index 80011e04..af8c6bd3 100644 --- a/opam +++ b/opam @@ -1,6 +1,6 @@ opam-version: "1.2" name: "containers" -version: "1.5.1" +version: "1.5.2" author: "Simon Cruanes" maintainer: "simon.cruanes@inria.fr" build: [ diff --git a/setup.ml b/setup.ml index 100152bb..a6f2a792 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.4.4 *) (* OASIS_START *) -(* DO NOT EDIT (digest: 29c11f03e114c88d092547016730a52f) *) +(* DO NOT EDIT (digest: 8a45fbcc3dc1199e20ced83543504d65) *) (* Regenerated by OASIS v0.4.10 Visit http://oasis.forge.ocamlcore.org for more information and @@ -7041,7 +7041,7 @@ let setup_t = { oasis_version = "0.4"; ocaml_version = Some (OASISVersion.VGreaterEqual "4.00.1"); - version = "1.5"; + version = "1.5.2"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -8900,7 +8900,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.10"; - oasis_digest = Some "3\167\146\011\152\220p\209\203\"x+y`Ay"; + oasis_digest = Some "/\027|\232W\235?\192\157\145^\200\176On^"; oasis_exec = None; oasis_setup_args = []; setup_update = false diff --git a/src/core/CCFormat.mli b/src/core/CCFormat.mli index a9f40d07..3af46e8d 100644 --- a/src/core/CCFormat.mli +++ b/src/core/CCFormat.mli @@ -8,6 +8,10 @@ type 'a sequence = ('a -> unit) -> unit include module type of Format + with type formatter = Format.formatter + and type formatter_out_functions = Format.formatter_out_functions + and type formatter_tag_functions = Format.formatter_tag_functions + type t = Format.formatter type 'a printer = t -> 'a -> unit diff --git a/src/core/META b/src/core/META index c2214eaa..d5c48969 100644 --- a/src/core/META +++ b/src/core/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: fb895e43d7bf196a6016effa48011802) -version = "1.5" +# DO NOT EDIT (digest: 6fc8b50f808e0788951f153fb45868c5) +version = "1.5.2" description = "A modular standard library focused on data structures." requires = "bytes result" archive(byte) = "containers.cma" @@ -9,7 +9,7 @@ archive(native) = "containers.cmxa" archive(native, plugin) = "containers.cmxs" exists_if = "containers.cma" package "unix" ( - version = "1.5" + version = "1.5.2" description = "A modular standard library focused on data structures." requires = "bytes result unix" archive(byte) = "containers_unix.cma" @@ -20,7 +20,7 @@ package "unix" ( ) package "top" ( - version = "1.5" + version = "1.5.2" description = "A modular standard library focused on data structures." requires = "compiler-libs.common containers containers.data containers.unix containers.sexp containers.iter" @@ -32,7 +32,7 @@ package "top" ( ) package "thread" ( - version = "1.5" + version = "1.5.2" description = "A modular standard library focused on data structures." requires = "containers threads" archive(byte) = "containers_thread.cma" @@ -43,7 +43,7 @@ package "thread" ( ) package "sexp" ( - version = "1.5" + version = "1.5.2" description = "A modular standard library focused on data structures." requires = "bytes result" archive(byte) = "containers_sexp.cma" @@ -54,7 +54,7 @@ package "sexp" ( ) package "iter" ( - version = "1.5" + version = "1.5.2" description = "A modular standard library focused on data structures." archive(byte) = "containers_iter.cma" archive(byte, plugin) = "containers_iter.cma" @@ -64,7 +64,7 @@ package "iter" ( ) package "data" ( - version = "1.5" + version = "1.5.2" description = "A modular standard library focused on data structures." requires = "bytes" archive(byte) = "containers_data.cma"