Skip to content

Commit e1de3da

Browse files
committed
prepare for 3.15
1 parent f02df05 commit e1de3da

10 files changed

+14
-10
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## main
44

5+
## 3.15
6+
7+
- Add `CCList.split_result` (#459)
8+
- pretty printer in MultiSet
59
- `CCHeap`: building a heap from an almost-sorted sequence
610
- perf: `CCHeap`: building a heap from n elements is now in time O(n)
711
instead of O(n log n)

containers-data.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is generated by dune, edit dune-project instead
22
opam-version: "2.0"
3-
version: "3.14"
3+
version: "3.15"
44
synopsis: "A set of advanced datatypes for containers"
55
maintainer: ["c-cube"]
66
authors: ["c-cube"]

containers.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is generated by dune, edit dune-project instead
22
opam-version: "2.0"
3-
version: "3.14"
3+
version: "3.15"
44
synopsis:
55
"A modular, clean and powerful extension of the OCaml standard library"
66
maintainer: ["c-cube"]

dune-project

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
(name containers)
33
(generate_opam_files true)
44

5-
(version 3.14)
5+
(version 3.15)
66
(authors c-cube)
77
(maintainers c-cube)
88
(license BSD-2-Clause)

src/core/CCHeap.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ module type S = sig
156156
[merge h (of_iter_almost_sorted iter)].
157157
See {!of_iter_almost_sorted}.
158158
Complexity: [O(log m + n)].
159-
@since NEXT_RELEASE
159+
@since 3.14
160160
*)
161161

162162
(** {2 Conversions} *)

src/core/CCHeap.mli

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ module type S = sig
151151
[merge h (of_iter_almost_sorted iter)].
152152
See {!of_iter_almost_sorted}.
153153
Complexity: [O(log m + n)].
154-
@since NEXT_RELEASE
154+
@since 3.14
155155
*)
156156

157157
(** {2 Conversions} *)
@@ -191,7 +191,7 @@ module type S = sig
191191
then successive {!take} run in [O(1)],
192192
and {!to_list_sorted} runs in [O(n)].
193193
Complexity: [O(n)].
194-
@since NEXT_RELEASE
194+
@since 3.14
195195
*)
196196

197197
val to_list : t -> elt list

src/core/CCList.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ val all_ok : ('a, 'err) result t -> ('a t, 'err) result
497497

498498
val split_result : ('ok, 'error) result list -> 'ok list * 'error list
499499
(** Split a list of results into [Ok]s and [Error]s.
500-
@since NEXT_RELEASE *)
500+
@since 3.14 *)
501501

502502
val sorted_mem : cmp:('a -> 'a -> int) -> 'a -> 'a list -> bool
503503
(** [sorted_mem ~cmp x l] and [mem x l] give the same result for any sorted list [l],

src/core/CCListLabels.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ val all_ok : ('a, 'err) result t -> ('a t, 'err) result
531531

532532
val split_result : ('ok, 'error) result list -> 'ok list * 'error list
533533
(** Split a list of results into [Ok]s and [Error]s.
534-
@since NEXT_RELEASE *)
534+
@since 3.14 *)
535535

536536
val sorted_mem : cmp:(('a -> 'a -> int)[@keep_label]) -> 'a -> 'a list -> bool
537537
(** [sorted_mem ~cmp x l] and [mem x l] give the same result for any sorted list [l],

src/data/CCMultiSet.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ module type S = sig
9898
elt printer ->
9999
t printer
100100
(** Print the multiset.
101-
@since NEXT_RELEASE *)
101+
@since 3.14 *)
102102
end
103103

104104
module Make (O : Set.OrderedType) = struct

src/data/CCMultiSet.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ module type S = sig
9595
elt printer ->
9696
t printer
9797
(** Print the multiset.
98-
@since NEXT_RELEASE *)
98+
@since 3.14 *)
9999
end
100100

101101
module Make (O : Set.OrderedType) : S with type elt = O.t

0 commit comments

Comments
 (0)