Bump cmdliner to 2.0.0

psafont · psafont · commit 4dfe6f8d0b81 · 2025-11-21T10:13:01.000Z
The type Arg.conv was made abstract and now needs to be handled with
specialized functions.

Shortened versions of the parameters do not work anymore.

Signed-off-by: Pau Ruiz Safont &lt;pau.safont@vates.tech&gt;
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+## Unreleased
+
+### Breaking
+
+- Update to use cmdliner 2.0.0. Shortened arguments will not work anymore. (#512, @psafont)
+
 ## 2.1.0
 
 ### Added
diff --git a/bin/help.ml b/bin/help.ml
@@ -249,14 +249,14 @@ let help man_format topic commands =
   | Some topic -> (
       let topics = ("topics" :: commands) @ List.map fst pages in
       let topics = List.sort compare topics 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 List.mem t commands -> `Help (man_format, Some t)
-      | `Ok t when t = "topics" ->
+      let conv = Cmdliner.Arg.enum (List.rev_map (fun s -> (s, s)) topics) in
+      match Arg.conv_parser conv topic with
+      | Error (`Msg e) -> `Error (false, e)
+      | Ok t when List.mem t commands -> `Help (man_format, Some t)
+      | Ok t when t = "topics" ->
           Fmt.pr "@[<v>%a@]@." Fmt.(list string) topics;
           `Ok 0
-      | `Ok t ->
+      | Ok t ->
           let man = try List.assoc t pages with Not_found -> assert false in
           Fmt.pr "%a" (Cmdliner.Manpage.print man_format) man;
           `Ok 0)
diff --git a/dune-project b/dune-project
@@ -34,7 +34,7 @@ with [Dune](https://github.com/ocaml/dune) and hosted on
   (fmt (>= 0.8.7))
   (fpath (>= 0.7.3))
   (bos (>= 0.1.3))
-  (cmdliner (>= 1.1.0))
+  (cmdliner (>= 2.0.0))
   (re (>= 1.7.2))
   astring
   (opam-file-format (>= 2.1.2))
diff --git a/dune-release.opam b/dune-release.opam
@@ -25,7 +25,7 @@ depends: [
   "fmt" {>= "0.8.7"}
   "fpath" {>= "0.7.3"}
   "bos" {>= "0.1.3"}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "1.3.0"}
   "re" {>= "1.7.2"}
   "astring"
   "opam-file-format" {>= "2.1.2"}
