Update to Cmdliner.1.1.0

Author: MisterDA

.ocamlformat

@@ -1,4 +1,4 @@
-version=0.20.0
+version=0.20.1
 module-item-spacing=compact
 break-infix=fit-or-vertical
 parens-tuple=multi-line-only

bin/carton/get.ml

@@ -117,8 +117,8 @@ let run hxd path info raw pack uid_or_offset =
 
 let run hxd path info raw pack uid_or_offset =
   match run hxd path info raw pack uid_or_offset with
-  | Ok () -> `Ok 0
-  | Error (`Msg err) -> `Error (false, Fmt.str "%s." err)
+  | Ok () -> Ok ()
+  | Error (`Msg err) -> Error (Fmt.str "%s." err)
 
 open Cmdliner
 
@@ -166,7 +166,6 @@ let uid_or_offset =
 
 let cmd =
   let doc = "Extract an object from a PACK file." in
-  let exits = Term.default_exits in
   let man =
     [
       `S Manpage.s_description;
@@ -175,15 +174,15 @@ let cmd =
          offset.";
     ]
   in
-  ( Term.(
-      ret
-        (const run
-        $ Hxd_cmdliner.cmd
-        $ with_path
-        $ with_info
-        $ raw
-        $ pack
-        $ uid_or_offset)),
-    Term.info "get" ~doc ~exits ~man )
-
-let () = Term.(exit_status @@ eval cmd)
+  let info = Cmd.info "get" ~doc ~man in
+  Cmd.v info
+    Term.(
+      const run
+      $ Hxd_cmdliner.cmd
+      $ with_path
+      $ with_info
+      $ raw
+      $ pack
+      $ uid_or_offset)
+
+let () = exit @@ Cmd.eval_result cmd

bin/carton/hxd_cmdliner.ml

@@ -340,7 +340,7 @@ let style_renderer ?env () =
   Arg.(value & opt color None & info [ "color" ] ?env ~doc ~docv:"<when>")
 
 let setup_fmt =
-  let env = Arg.env_var "HXD_COLOR" in
+  let env = Cmd.Env.info "HXD_COLOR" in
   Term.(const run_fmt $ style_renderer ~env ())
 
 let cmd = Term.(const make $ setup_fmt $ cols $ groupsize $ uppercase $ pixel)

bin/carton/index_pack.ml

@@ -350,8 +350,8 @@ let index_pack ?(verbose = false) src dst =
 
 let run verbose src dst =
   match (Fiber.run <.> prj) (index_pack ~verbose src dst) with
-  | Ok () -> `Ok 0
-  | Error (`Msg err) -> `Error (false, Fmt.str "%s." err)
+  | Ok () -> Ok ()
+  | Error (`Msg err) -> Error (Fmt.str "%s." err)
 
 open Cmdliner
 
@@ -388,16 +388,15 @@ let verbose =
 
 let cmd =
   let doc = "Build pack index for an packed archive." in
-  let exits = Term.default_exits in
   let man =
     [
       `S Manpage.s_description;
       `P
-        "Readss a packed archive (.pack) from a specified file (or standard \
+        "Reads a packed archive (.pack) from a specified file (or standard \
          input), and builds a pack index file (.idx) for it.";
     ]
   in
-  ( Term.(ret (const run $ verbose $ src $ dst)),
-    Term.info "index-pack" ~doc ~exits ~man )
+  let info = Cmd.info "index-pack" ~doc ~man in
+  Cmd.v info Term.(const run $ verbose $ src $ dst)
 
-let () = Term.(exit_status @@ eval cmd)
+let () = exit @@ Cmd.eval_result cmd

bin/carton/verify_pack.ml

@@ -271,8 +271,8 @@ let run ~verbose fpath =
 
 let run verbose fpath =
   match Fiber.run (run ~verbose fpath) with
-  | Ok () -> `Ok 0
-  | Error (`Msg err) -> `Error (false, Fmt.str "%s." err)
+  | Ok () -> Ok ()
+  | Error (`Msg err) -> Error (Fmt.str "%s." err)
 
 open Cmdliner
 
@@ -298,7 +298,6 @@ let fpath =
 
 let cmd =
   let doc = "Validate packed Git archive files" in
-  let exits = Term.default_exits in
   let man =
     [
       `S Manpage.s_description;
@@ -308,7 +307,7 @@ let cmd =
          pack file.";
     ]
   in
-  ( Term.(ret (const run $ verbose $ fpath)),
-    Term.info "verify-pack" ~doc ~exits ~man )
+  let info = Cmd.info "verify-pack" ~doc ~man in
+  Cmd.v info Term.(const run $ verbose $ fpath)
 
-let () = Term.(exit_status @@ eval cmd)
+let () = exit @@ Cmd.eval_result cmd

bin/guit/fetch.ml

@@ -88,7 +88,7 @@ open Cmdliner
  * [--progress] <repository> <refspec>... *)
 
 let output =
-  let conv' =
+  let converter =
     let parse str =
       match str with
       | "stdout" -> Ok Fmt.stdout
@@ -104,7 +104,8 @@ let output =
     "Output of the progress status. Can take values 'stdout' (default) or \
      'stderr'."
   in
-  Arg.(value & opt conv' Fmt.stdout & info [ "output" ] ~doc ~docv:"<output>")
+  Arg.(
+    value & opt converter Fmt.stdout & info [ "output" ] ~doc ~docv:"<output>")
 
 let directory =
   let doc = "Indicate path to repository root containing '.git' folder" in
@@ -137,18 +138,22 @@ let references =
     & info ~doc ~docv:"<ref>" [])
 
 let setup_logs =
+  let docs = Manpage.s_common_options in
   Term.(
-    const setup_logs $ Fmt_cli.style_renderer () $ Logs_cli.level () $ output)
+    const setup_logs
+    $ Fmt_cli.style_renderer ~docs ()
+    $ Logs_cli.level ~docs ()
+    $ output)
 
 let main (quiet, _) references directory repository =
   match Lwt_main.run (main quiet references directory repository) with
-  | Ok () -> `Ok ()
-  | Error (#error as err) -> `Error (false, Fmt.str "%a." pp_error err)
+  | Ok () -> Ok ()
+  | Error (#error as err) -> Error (Fmt.str "%a." pp_error err)
 
 let command =
   let doc = "Fetch a Git repository." in
-  let exits = Term.default_exits in
-  ( Term.(ret (const main $ setup_logs $ references $ directory $ repository)),
-    Term.info "fetch" ~doc ~exits )
+  let info = Cmd.info "fetch" ~doc in
+  Cmd.v info
+    Term.(const main $ setup_logs $ references $ directory $ repository)
 
-let () = Term.(exit @@ eval command)
+let () = exit @@ Cmd.eval_result command

bin/guit/v.ml

@@ -65,8 +65,8 @@ let main quiet path =
 
 let main logs path =
   match Lwt_main.run (main logs path) with
-  | Ok () -> `Ok 0
-  | Error (`Msg err) -> `Error (false, Fmt.str "%s." err)
+  | Ok () -> Ok ()
+  | Error (`Msg err) -> Error (Fmt.str "%s." err)
 
 open Cmdliner
 
@@ -80,11 +80,13 @@ let directory =
     & info [ "r"; "root" ] ~doc ~docv:"<directory>")
 
 let setup_logs =
-  Term.(const setup_logs $ Fmt_cli.style_renderer () $ Logs_cli.level ())
+  let docs = Manpage.s_common_options in
+  Term.(
+    const setup_logs $ Fmt_cli.style_renderer ~docs () $ Logs_cli.level ~docs ())
 
 let command =
   let doc = "Make a Git repository." in
-  let exits = Term.default_exits in
-  Term.(ret (const main $ setup_logs $ directory)), Term.info "v" ~doc ~exits
+  let info = Cmd.info "v" ~doc in
+  Cmd.v info Term.(const main $ setup_logs $ directory)
 
-let () = Term.(exit @@ eval command)
+let () = exit @@ Cmd.eval_result command

carton.opam

@@ -23,8 +23,8 @@ depends: [
   "checkseum" {>= "0.3.2"}
   "logs"
   "bigarray-compat"
-  "cmdliner" {>= "1.0.4"}
-  "hxd" {>= "0.3.0"}
+  "cmdliner" {>= "1.1.0"}
+  "hxd" {>= "0.3.2"}
   "psq" {>= "0.2.0"}
   "fmt" {>= "0.8.9"}
   "result"
@@ -37,7 +37,7 @@ depends: [
   "base-unix" {with-test}
   "base-threads" {with-test}
   "alcotest" {with-test}
-  "crowbar" {with-test & >= "0.2"}
+  "crowbar" {with-test & >= "0.2.1"}
   "alcotest-lwt" {>= "1.2.3" & with-test}
   "lwt" {>= "5.3.0" & with-test}
   "ocamlfind" {>= "1.8.1" & with-test}

git-unix.opam

@@ -34,7 +34,7 @@ depends: [
   "awa" {>= "0.1.0"}
   "mirage-time" {>= "2.0.0"}
   "mirage-unix" {>= "5.0.0"}
-  "cmdliner" {>= "1.0.4"}
+  "cmdliner" {>= "1.1.0"}
   "decompress" {>= "1.4.0"}
   "domain-name" {>= "0.3.0"}
   "ipaddr" {>= "5.0.1"}

git.opam

@@ -43,17 +43,17 @@ depends: [
   "alcotest" {with-test & >= "1.1.0"}
   "alcotest-lwt" {with-test & >= "1.1.0"}
   "mirage-crypto-rng" {with-test & >= "0.8.0"}
-  "cmdliner" {with-test}
+  "cmdliner" {with-test & >= "1.1.0"}
   "base-unix" {with-test}
   "fpath"
-  "hxd" {>= "0.3.1"}
+  "hxd" {>= "0.3.2"}
   "mirage-flow" {>= "2.0.1"}
   "domain-name" {>= "0.3.0"}
   "emile" {>= "1.1"}
   "ipaddr" {>= "5.0.1"}
   "psq" {>= "0.2.0"}
   "uri" {>= "4.1.0"}
-  "crowbar" {>= "0.2" & with-test}
+  "crowbar" {>= "0.2.1" & with-test}
 ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]