Merge pull request #80 from tmcgilchrist/cmdliner_2

Update cmdliner 2.0

Author: tmcgilchrist

.ocamlformat

@@ -1,4 +1,4 @@
-version = 0.27.0
+version = 0.28.1
 profile = conventional
 
 ocaml-version = 5.0.0

dune-project

@@ -18,11 +18,11 @@
  (depends
   (ocaml (>= "5.0.0~"))
   hdr_histogram
-  (cmdliner (and (>= 1.1.0) (< 2.0)))
+  (cmdliner (>= 2.0.0))
   (trace-fuchsia (= 0.10))
   (trace (= 0.10))
   (menhir :with-test)
-  (ocamlformat (and :with-dev-setup (= 0.27.0)))
+  (ocamlformat (and :with-dev-setup (= 0.28.1)))
   (alcotest (and :with-test (>= 1.9.0)))))
 
 (package
@@ -32,4 +32,4 @@
  (maintenance_intent "(latest)")
  (depends
   (ocaml (>= "5.0.0~"))
-  (cmdliner (and (>= 1.1.0) (< 2.0)))))
+  (cmdliner (>= 2.0.0))))

lib/olly_common/cli.ml

@@ -20,14 +20,15 @@ let help man_format cmds topic =
   | None -> `Help (`Pager, None) (* help about the program. *)
   | Some topic -> (
       let topics = "topics" :: cmds in
-      let conv, _ = Cmdliner.Arg.enum (List.rev_map (fun s -> (s, s)) topics) in
-      match conv topic with
-      | `Error e -> `Error (false, e)
-      | `Ok t when t = "topics" ->
+      let conv = Cmdliner.Arg.enum (List.rev_map (fun s -> (s, s)) topics) in
+      let parse = Cmdliner.Arg.Conv.parser conv in
+      match parse topic with
+      | Error e -> `Error (false, e)
+      | Ok t when t = "topics" ->
           List.iter print_endline topics;
           `Ok ()
-      | `Ok t when List.mem t cmds -> `Help (man_format, Some t)
-      | `Ok _t ->
+      | Ok t when List.mem t cmds -> `Help (man_format, Some t)
+      | Ok _t ->
           let page =
             ((topic, 7, "", "", ""), [ `S topic; `P "Say something" ])
           in

runtime_events_tools.opam

@@ -11,11 +11,11 @@ depends: [
   "dune" {>= "3.18"}
   "ocaml" {>= "5.0.0~"}
   "hdr_histogram"
-  "cmdliner" {>= "1.1.0" & < "2.0"}
+  "cmdliner" {>= "2.0.0"}
   "trace-fuchsia" {= "0.10"}
   "trace" {= "0.10"}
   "menhir" {with-test}
-  "ocamlformat" {with-dev-setup & = "0.27.0"}
+  "ocamlformat" {with-dev-setup & = "0.28.1"}
   "alcotest" {with-test & >= "1.9.0"}
   "odoc" {with-doc}
 ]

runtime_events_tools_bare.opam

@@ -11,7 +11,7 @@ bug-reports: "https://github.com/tarides/runtime_events_tools/issues"
 depends: [
   "dune" {>= "3.18"}
   "ocaml" {>= "5.0.0~"}
-  "cmdliner" {>= "1.1.0" & < "2.0"}
+  "cmdliner" {>= "2.0.0"}
   "odoc" {with-doc}
 ]
 build: [