Merge pull request #445 from hannesm/cmdliner-1.1.0

support cmdliner 1.1.0 and above without deprecation

lwt/examples/echo_client.ml

@@ -62,7 +62,9 @@ let trust =
   Arg.(value & opt (some string) None & info [ "trust" ] ~doc)
 
 let cmd =
-  Term.(const jump $ setup_log $ port $ host $ trust),
-  Term.info "server" ~version:"%%VERSION_NUM%%"
+  let term = Term.(const jump $ setup_log $ port $ host $ trust)
+  and info = Cmd.info "server" ~version:"%%VERSION_NUM%%"
+  in
+  Cmd.v info term
 
-let () = match Term.eval cmd with `Ok () -> exit 0 | _ -> exit 1
+let () = exit (Cmd.eval cmd)

lwt/examples/echo_server.ml

@@ -67,7 +67,9 @@ let port =
   Arg.(value & opt int 4433 & info [ "port" ] ~doc)
 
 let cmd =
-  Term.(ret (const echo_server $ setup_log $ port)),
-  Term.info "server" ~version:"%%VERSION_NUM%%"
+  let term = Term.(ret (const echo_server $ setup_log $ port))
+  and info = Cmd.info "server" ~version:"%%VERSION_NUM%%"
+  in
+  Cmd.v info term
 
-let () = match Term.eval cmd with `Ok () -> exit 0 | _ -> exit 1
+let () = exit (Cmd.eval cmd)

lwt/examples/fuzz_server.ml

@@ -93,7 +93,9 @@ let port =
   Arg.(value & opt int 4433 & info [ "port" ] ~doc)
 
 let cmd =
-  Term.(ret (const jump $ setup_log $ port)),
-  Term.info "server" ~version:"%%VERSION_NUM%%"
+  let term = Term.(ret (const jump $ setup_log $ port))
+  and info = Cmd.info "server" ~version:"%%VERSION_NUM%%"
+  in
+  Cmd.v info term
 
-let () = match Term.eval cmd with `Ok () -> exit 0 | _ -> exit 1
+let () = exit (Cmd.eval cmd)

lwt/examples/test_client.ml

@@ -44,7 +44,9 @@ let jump _ =
 open Cmdliner
 
 let cmd =
-  Term.(ret (const jump $ setup_log)),
-  Term.info "test_client" ~version:"%%VERSION_NUM%%"
+  let term = Term.(ret (const jump $ setup_log))
+  and info = Cmd.info "test_client" ~version:"%%VERSION_NUM%%"
+  in
+  Cmd.v info term
 
-let () = match Term.eval cmd with `Ok () -> exit 0 | _ -> exit 1
+let () = exit (Cmd.eval cmd)

tls.opam

@@ -38,6 +38,7 @@ depends: [
   "ipaddr-sexp"
   "alcotest" {with-test}
   "randomconv" {with-test}
+  "cmdliner" {dev & > "1.1.0"}
 ]
 conflicts: [ "result" {< "1.5"} ]
 tags: [ "org:mirage"]