Skip to content

Commit

Permalink
prepare for 3.15
Browse files Browse the repository at this point in the history
  • Loading branch information
c-cube committed Nov 15, 2024
1 parent 6dcaddb commit f519986
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/core/CCHeap.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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} *)
Expand Down
4 changes: 2 additions & 2 deletions src/core/CCHeap.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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} *)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/core/CCList.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion src/core/CCListLabels.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion src/data/CCMultiSet.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/data/CCMultiSet.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit f519986

Please sign in to comment.