From e1de3da1e32413e8faf32dab58a0be8bbc9be51d Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Fri, 15 Nov 2024 11:14:55 -0500 Subject: [PATCH] prepare for 3.15 --- CHANGELOG.md | 4 ++++ containers-data.opam | 2 +- containers.opam | 2 +- dune-project | 2 +- src/core/CCHeap.ml | 2 +- src/core/CCHeap.mli | 4 ++-- src/core/CCList.mli | 2 +- src/core/CCListLabels.mli | 2 +- src/data/CCMultiSet.ml | 2 +- src/data/CCMultiSet.mli | 2 +- 10 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9a236e77..905347d6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## main +## 3.15 + +- Add `CCList.split_result` (#459) +- pretty printer in MultiSet - `CCHeap`: building a heap from an almost-sorted sequence - perf: `CCHeap`: building a heap from n elements is now in time O(n) instead of O(n log n) diff --git a/containers-data.opam b/containers-data.opam index 12b4d9a70..2bb2c79b3 100644 --- a/containers-data.opam +++ b/containers-data.opam @@ -1,6 +1,6 @@ # This file is generated by dune, edit dune-project instead opam-version: "2.0" -version: "3.14" +version: "3.15" synopsis: "A set of advanced datatypes for containers" maintainer: ["c-cube"] authors: ["c-cube"] diff --git a/containers.opam b/containers.opam index de0ad37ea..7d7fbd5c1 100644 --- a/containers.opam +++ b/containers.opam @@ -1,6 +1,6 @@ # This file is generated by dune, edit dune-project instead opam-version: "2.0" -version: "3.14" +version: "3.15" synopsis: "A modular, clean and powerful extension of the OCaml standard library" maintainer: ["c-cube"] diff --git a/dune-project b/dune-project index 40eeadf3e..042c4916a 100644 --- a/dune-project +++ b/dune-project @@ -2,7 +2,7 @@ (name containers) (generate_opam_files true) -(version 3.14) +(version 3.15) (authors c-cube) (maintainers c-cube) (license BSD-2-Clause) diff --git a/src/core/CCHeap.ml b/src/core/CCHeap.ml index 008646e0a..6c799b561 100644 --- a/src/core/CCHeap.ml +++ b/src/core/CCHeap.ml @@ -156,7 +156,7 @@ module type S = sig [merge h (of_iter_almost_sorted iter)]. See {!of_iter_almost_sorted}. Complexity: [O(log m + n)]. - @since NEXT_RELEASE + @since 3.14 *) (** {2 Conversions} *) diff --git a/src/core/CCHeap.mli b/src/core/CCHeap.mli index 40c343b17..fc34a2cf1 100644 --- a/src/core/CCHeap.mli +++ b/src/core/CCHeap.mli @@ -151,7 +151,7 @@ module type S = sig [merge h (of_iter_almost_sorted iter)]. See {!of_iter_almost_sorted}. Complexity: [O(log m + n)]. - @since NEXT_RELEASE + @since 3.14 *) (** {2 Conversions} *) @@ -191,7 +191,7 @@ module type S = sig then successive {!take} run in [O(1)], and {!to_list_sorted} runs in [O(n)]. Complexity: [O(n)]. - @since NEXT_RELEASE + @since 3.14 *) val to_list : t -> elt list diff --git a/src/core/CCList.mli b/src/core/CCList.mli index 1bf14ae37..cf7d55abb 100644 --- a/src/core/CCList.mli +++ b/src/core/CCList.mli @@ -497,7 +497,7 @@ val all_ok : ('a, 'err) result t -> ('a t, 'err) result val split_result : ('ok, 'error) result list -> 'ok list * 'error list (** Split a list of results into [Ok]s and [Error]s. - @since NEXT_RELEASE *) + @since 3.14 *) val sorted_mem : cmp:('a -> 'a -> int) -> 'a -> 'a list -> bool (** [sorted_mem ~cmp x l] and [mem x l] give the same result for any sorted list [l], diff --git a/src/core/CCListLabels.mli b/src/core/CCListLabels.mli index f0c823172..b7964efd4 100644 --- a/src/core/CCListLabels.mli +++ b/src/core/CCListLabels.mli @@ -531,7 +531,7 @@ val all_ok : ('a, 'err) result t -> ('a t, 'err) result val split_result : ('ok, 'error) result list -> 'ok list * 'error list (** Split a list of results into [Ok]s and [Error]s. - @since NEXT_RELEASE *) + @since 3.14 *) val sorted_mem : cmp:(('a -> 'a -> int)[@keep_label]) -> 'a -> 'a list -> bool (** [sorted_mem ~cmp x l] and [mem x l] give the same result for any sorted list [l], diff --git a/src/data/CCMultiSet.ml b/src/data/CCMultiSet.ml index 4fd8352a8..4febdfd57 100644 --- a/src/data/CCMultiSet.ml +++ b/src/data/CCMultiSet.ml @@ -98,7 +98,7 @@ module type S = sig elt printer -> t printer (** Print the multiset. - @since NEXT_RELEASE *) + @since 3.14 *) end module Make (O : Set.OrderedType) = struct diff --git a/src/data/CCMultiSet.mli b/src/data/CCMultiSet.mli index dace10a84..4fe26d003 100644 --- a/src/data/CCMultiSet.mli +++ b/src/data/CCMultiSet.mli @@ -95,7 +95,7 @@ module type S = sig elt printer -> t printer (** Print the multiset. - @since NEXT_RELEASE *) + @since 3.14 *) end module Make (O : Set.OrderedType) : S with type elt = O.t