Skip to content

Commit b2cff1d

Browse files
committed
prepare for 3.6
1 parent 2c7e907 commit b2cff1d

File tree

8 files changed

+78
-65
lines changed

8 files changed

+78
-65
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## 3.6
4+
5+
- rename `CCOpt` to `CCOption` and deprecate `CCOpt`
6+
- add iterator functions to `CCIO`
7+
- `CCOrd`: add `poly`, deprecate `compare`
8+
- add `CCIO.File.walk_iter`
9+
- `CCParse`: heavy refactoring, many new functions
10+
* backtracking by default
11+
* add `slice` and the ability to recurse on them
12+
* expose Position module, add `or_`, `both`, `lookahead`, `U.bool`
13+
* example Sexpr parser, and a test
14+
* example and test of an IRC log parser
15+
316
## 3.5
417

518
- add `CCHash.map` and `CCHash.bytes`

containers-data.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "3.5"
2+
version: "3.6"
33
author: "Simon Cruanes"
44
maintainer: "[email protected]"
55
synopsis: "A set of advanced datatypes for containers"

containers-thread.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opam-version: "2.0"
2-
version: "3.5"
2+
version: "3.6"
33
author: "Simon Cruanes"
44
maintainer: "[email protected]"
55
license: "BSD-2-Clause"

containers.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opam-version: "2.0"
22
name: "containers"
3-
version: "3.5"
3+
version: "3.6"
44
author: "Simon Cruanes"
55
maintainer: "[email protected]"
66
license: "BSD-2-Clause"

src/core/CCIO.mli

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ val read_chunks_seq : ?size:int -> in_channel -> string Seq.t
8080

8181
val read_chunks_iter : ?size:int -> in_channel -> string iter
8282
(** Read the channel's content into chunks of size at most [size]
83-
@since NEXT_RELEASE *)
83+
@since 3.6 *)
8484

8585
val read_line : in_channel -> string option
8686
(** Read a line from the channel. Returns [None] if the input is terminated.
@@ -99,7 +99,7 @@ val read_lines_seq : in_channel -> string Seq.t
9999

100100
val read_lines_iter : in_channel -> string iter
101101
(** Read all lines.
102-
@since NEXT_RELEASE *)
102+
@since 3.6 *)
103103

104104
val read_lines_l : in_channel -> string list
105105
(** Read all lines into a list. *)
@@ -146,7 +146,7 @@ val write_lines : out_channel -> string gen -> unit
146146

147147
val write_lines_iter : out_channel -> string iter -> unit
148148
(** Write every string on the output, followed by "\n".
149-
@since NEXT_RELEASE *)
149+
@since 3.6 *)
150150

151151
val write_lines_seq : out_channel -> string Seq.t -> unit
152152
(** Write every string on the output, followed by "\n".
@@ -265,7 +265,7 @@ module File : sig
265265

266266
val walk_iter : t -> walk_item iter
267267
(** Like {!walk} but with an imperative iterator.
268-
@since NEXT_RELEASE *)
268+
@since 3.6 *)
269269

270270
val walk_l : t -> walk_item list
271271
(** Like {!walk} but returns a list (therefore it's eager and might
@@ -274,7 +274,7 @@ module File : sig
274274

275275
val walk_seq : t -> walk_item Seq.t
276276
(** Like {!walk} but returns a Seq
277-
@since NEXT_RELEASE *)
277+
@since 3.6 *)
278278

279279
val show_walk_item : walk_item -> string
280280

src/core/CCOption.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
(** Options
44
55
This module replaces `CCOpt`.
6-
@since NEXT_RELEASE *)
6+
@since 3.6 *)
77

88
type +'a t = 'a option
99

src/core/CCOrd.mli

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ type 'a t = 'a -> 'a -> int
99
val poly : 'a t
1010
(** Polymorphic "magic" comparison. Use with care, as it will fail on
1111
some types.
12-
@since NEXT_RELEASE *)
12+
@since 3.6 *)
1313

1414
val compare : 'a t
1515
[@@deprecated "use CCOrd.poly instead, this name is too general"]
1616
(** Polymorphic "magic" comparison.
17-
@deprecated since NEXT_RELEASE in favor of {!poly}. The reason is that
17+
@deprecated since 3.6 in favor of {!poly}. The reason is that
1818
[compare] is easily shadowed, can shadow other comparators, and is just
1919
generally not very descriptive. *)
2020

0 commit comments

Comments
 (0)