simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-10 13:13:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into stable

Browse source
This commit is contained in:
Simon Cruanes 2018-01-04 11:13:34 -06:00
commit 5ebed4e324
6 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.adoc
View file

@ -1,5 +1,9 @@
= Changelog = Changelog
== 1.5.1
- re-export `Format` types and functions in `CCFormat`
== 1.5 == 1.5
- have `CCList.{get,insert,set}_at_idx` work with negative indices - have `CCList.{get,insert,set}_at_idx` work with negative indices

2
_oasis
View file

@ -1,6 +1,6 @@
OASISFormat: 0.4 OASISFormat: 0.4
Name: containers Name: containers
Version: 1.5 Version: 1.5.2
Homepage: https://github.com/c-cube/ocaml-containers Homepage: https://github.com/c-cube/ocaml-containers
Authors: Simon Cruanes Authors: Simon Cruanes
License: BSD-2-clause License: BSD-2-clause

2
opam
View file

@ -1,6 +1,6 @@
opam-version: "1.2" opam-version: "1.2"
name: "containers" name: "containers"
version: "1.5.1" version: "1.5.2"
author: "Simon Cruanes" author: "Simon Cruanes"
maintainer: "simon.cruanes@inria.fr" maintainer: "simon.cruanes@inria.fr"
build: [ build: [

6
setup.ml
View file

@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.4 *) (* setup.ml generated for the first time by OASIS v0.4.4 *)
(* OASIS_START *) (* OASIS_START *)
(* DO NOT EDIT (digest: 29c11f03e114c88d092547016730a52f) *) (* DO NOT EDIT (digest: 8a45fbcc3dc1199e20ced83543504d65) *)
(* (*
Regenerated by OASIS v0.4.10 Regenerated by OASIS v0.4.10
Visit http://oasis.forge.ocamlcore.org for more information and Visit http://oasis.forge.ocamlcore.org for more information and
@ -7041,7 +7041,7 @@ let setup_t =
{ {
oasis_version = "0.4"; oasis_version = "0.4";
ocaml_version = Some (OASISVersion.VGreaterEqual "4.00.1"); ocaml_version = Some (OASISVersion.VGreaterEqual "4.00.1");
version = "1.5"; version = "1.5.2";
license = license =
OASISLicense.DEP5License OASISLicense.DEP5License
(OASISLicense.DEP5Unit (OASISLicense.DEP5Unit
@ -8900,7 +8900,7 @@ let setup_t =
}; };
oasis_fn = Some "_oasis"; oasis_fn = Some "_oasis";
oasis_version = "0.4.10"; 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_exec = None;
oasis_setup_args = []; oasis_setup_args = [];
setup_update = false setup_update = false

4
src/core/CCFormat.mli
View file

@ -8,6 +8,10 @@
type 'a sequence = ('a -> unit) -> unit type 'a sequence = ('a -> unit) -> unit
include module type of Format 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 t = Format.formatter
type 'a printer = t -> 'a -> unit type 'a printer = t -> 'a -> unit

16
src/core/META
View file

@ -1,6 +1,6 @@
# OASIS_START # OASIS_START
# DO NOT EDIT (digest: fb895e43d7bf196a6016effa48011802) # DO NOT EDIT (digest: 6fc8b50f808e0788951f153fb45868c5)
version = "1.5" version = "1.5.2"
description = "A modular standard library focused on data structures." description = "A modular standard library focused on data structures."
requires = "bytes result" requires = "bytes result"
archive(byte) = "containers.cma" archive(byte) = "containers.cma"
@ -9,7 +9,7 @@ archive(native) = "containers.cmxa"
archive(native, plugin) = "containers.cmxs" archive(native, plugin) = "containers.cmxs"
exists_if = "containers.cma" exists_if = "containers.cma"
package "unix" ( package "unix" (
version = "1.5" version = "1.5.2"
description = "A modular standard library focused on data structures." description = "A modular standard library focused on data structures."
requires = "bytes result unix" requires = "bytes result unix"
archive(byte) = "containers_unix.cma" archive(byte) = "containers_unix.cma"
@ -20,7 +20,7 @@ package "unix" (
) )
package "top" ( package "top" (
version = "1.5" version = "1.5.2"
description = "A modular standard library focused on data structures." description = "A modular standard library focused on data structures."
requires = requires =
"compiler-libs.common containers containers.data containers.unix containers.sexp containers.iter" "compiler-libs.common containers containers.data containers.unix containers.sexp containers.iter"
@ -32,7 +32,7 @@ package "top" (
) )
package "thread" ( package "thread" (
version = "1.5" version = "1.5.2"
description = "A modular standard library focused on data structures." description = "A modular standard library focused on data structures."
requires = "containers threads" requires = "containers threads"
archive(byte) = "containers_thread.cma" archive(byte) = "containers_thread.cma"
@ -43,7 +43,7 @@ package "thread" (
) )
package "sexp" ( package "sexp" (
version = "1.5" version = "1.5.2"
description = "A modular standard library focused on data structures." description = "A modular standard library focused on data structures."
requires = "bytes result" requires = "bytes result"
archive(byte) = "containers_sexp.cma" archive(byte) = "containers_sexp.cma"
@ -54,7 +54,7 @@ package "sexp" (
) )
package "iter" ( package "iter" (
version = "1.5" version = "1.5.2"
description = "A modular standard library focused on data structures." description = "A modular standard library focused on data structures."
archive(byte) = "containers_iter.cma" archive(byte) = "containers_iter.cma"
archive(byte, plugin) = "containers_iter.cma" archive(byte, plugin) = "containers_iter.cma"
@ -64,7 +64,7 @@ package "iter" (
) )
package "data" ( package "data" (
version = "1.5" version = "1.5.2"
description = "A modular standard library focused on data structures." description = "A modular standard library focused on data structures."
requires = "bytes" requires = "bytes"
archive(byte) = "containers_data.cma" archive(byte) = "containers_data.cma"