Merge pull request #371 from Leonidas-from-XIV/cmdliner-1-dot-1

Fix compatibility with Cmdliner 1.1.0

Author: Leonidas-from-XIV

CHANGES.md

@@ -8,6 +8,8 @@
 
 #### Fixed
 
+- Fixed compatibility with Cmdliner 1.1.0 (#371, @Leonidas-from-XIV)
+
 #### Removed
 
 #### Security

bin/cli.ml

@@ -5,7 +5,7 @@ let named wrapper = Term.(app (const wrapper))
 
 let non_deterministic =
   let doc = "Run non-deterministic tests." in
-  let env = Arg.env_var ~doc "MDX_RUN_NON_DETERMINISTIC" in
+  let env = Cmd.Env.info ~doc "MDX_RUN_NON_DETERMINISTIC" in
   named
     (fun x -> `Non_deterministic x)
     Arg.(value & flag & info [ "non-deterministic"; "n" ] ~env ~doc)

bin/deps.ml

@@ -33,10 +33,11 @@ let run (`Setup ()) (`Syntax syntax) (`File file) =
   Printf.printf "%s" (Mdx.Util.Csexp.to_string (List deps));
   0
 
-let cmd =
-  let open Cmdliner in
-  let doc =
-    "List the dependencies of the input file. This command is meant to be used \
-     by dune only. There are no stability guarantees."
-  in
-  (Term.(pure run $ Cli.setup $ Cli.syntax $ Cli.file), Term.info "deps" ~doc)
+let term = Cmdliner.Term.(const run $ Cli.setup $ Cli.syntax $ Cli.file)
+
+let doc =
+  "List the dependencies of the input file. This command is meant to be used \
+   by dune only. There are no stability guarantees."
+
+let info = Cmdliner.Cmd.info "deps" ~doc
+let cmd = Cmdliner.Cmd.v info term

bin/deps.mli

@@ -14,6 +14,4 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
 
-open Cmdliner
-
-val cmd : int Term.t * Term.info
+val cmd : int Cmdliner.Cmd.t

bin/dune_gen.ml

@@ -56,11 +56,11 @@ let run (`Setup ()) (`Prelude prelude) (`Directories dirs) =
   Buffer.output_buffer stdout buffer;
   0
 
-let cmd =
-  let open Cmdliner in
-  let doc =
-    "Generate the source for a specialized testing binary. This command is \
-     meant to be used by dune only. There are no stability guarantees."
-  in
-  ( Term.(pure run $ Cli.setup $ Cli.prelude $ Cli.directories),
-    Term.info "dune-gen" ~doc )
+let term = Cmdliner.Term.(const run $ Cli.setup $ Cli.prelude $ Cli.directories)
+
+let doc =
+  "Generate the source for a specialized testing binary. This command is meant \
+   to be used by dune only. There are no stability guarantees."
+
+let info = Cmdliner.Cmd.info "dune-gen" ~doc
+let cmd = Cmdliner.Cmd.v info term

bin/dune_gen.mli

@@ -14,6 +14,4 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
 
-open Cmdliner
-
-val cmd : int Term.t * Term.info
+val cmd : int Cmdliner.Cmd.t

bin/main.ml

@@ -19,11 +19,11 @@ open Cmdliner
 let cmds = [ Test.cmd; Pp.cmd; Deps.cmd; Dune_gen.cmd ]
 let main (`Setup ()) = `Help (`Pager, None)
 
-let main =
+let info =
   let doc = "Execute markdown files." in
-  let exits = Term.default_exits in
   let man = [] in
-  ( Term.(ret (const main $ Cli.setup)),
-    Term.info "ocaml-mdx" ~version:"%%VERSION%%" ~doc ~exits ~man )
+  Cmd.info "ocaml-mdx" ~version:"%%VERSION%%" ~doc ~man
 
-let () = Term.(exit_status @@ eval_choice main cmds)
+let default = Term.(ret (const main $ Cli.setup))
+let group = Cmd.group ~default info cmds
+let () = Stdlib.exit @@ Cmd.eval' group

bin/pp.ml

@@ -62,8 +62,7 @@ let run (`Setup ()) (`File file) (`Section section) =
 
 open Cmdliner
 
-let cmd =
-  let doc = "Pre-process markdown files to produce OCaml code." in
-  let exits = Term.default_exits in
-  ( Term.(pure run $ Cli.setup $ Cli.file $ Cli.section),
-    Term.info "pp" ~doc ~exits )
+let term = Term.(const run $ Cli.setup $ Cli.file $ Cli.section)
+let doc = "Pre-process markdown files to produce OCaml code."
+let info = Cmd.info "pp" ~doc
+let cmd = Cmd.v info term

bin/pp.mli

@@ -14,6 +14,4 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
 
-open Cmdliner
-
-val cmd : int Term.t * Term.info
+val cmd : int Cmdliner.Cmd.t

bin/test.ml

@@ -47,11 +47,12 @@ let run (`Setup ()) _ _ _ _ _ _ _ _ _ _ =
 
 open Cmdliner
 
-let cmd : int Term.t * Term.info =
-  let doc = "Test markdown files." in
-  ( Term.(
-      pure run $ Cli.setup $ Cli.non_deterministic $ Cli.silent_eval
-      $ Cli.syntax $ Cli.silent $ Cli.verbose_findlib $ Cli.prelude
-      $ Cli.prelude_str $ Cli.file $ Cli.section $ Cli.root $ Cli.force_output
-      $ Cli.output),
-    Term.info "test" ~doc )
+let term =
+  Term.(
+    const run $ Cli.setup $ Cli.non_deterministic $ Cli.silent_eval $ Cli.syntax
+    $ Cli.silent $ Cli.verbose_findlib $ Cli.prelude $ Cli.prelude_str
+    $ Cli.file $ Cli.section $ Cli.root $ Cli.force_output $ Cli.output)
+
+let doc = "Test markdown files."
+let info = Cmd.info "test" ~doc
+let cmd = Cmd.v info term