reformat+minor

Author: kit-ty-kate

src/client/opamAdminCommand.ml

@@ -1409,7 +1409,10 @@ let help =
     | None       -> `Help (`Pager, None)
     | Some topic ->
       let topics = "topics" :: cmds in
-      let conv = OpamCmdliner.Arg.conv_parser @@ OpamCmdliner.Arg.enum (List.rev_map (fun s -> (s, s)) topics) in
+      let conv =
+        OpamCmdliner.Arg.conv_parser
+          (OpamCmdliner.Arg.enum (List.rev_map (fun s -> (s, s)) topics))
+      in
       match conv topic with
       | Error (`Msg e) -> `Error (false, e)
       | Ok t when t = "topics" ->

src/client/opamArg.ml

@@ -808,13 +808,14 @@ let package_version =
 
 let positive_integer : int Arg.conv =
   let parser = Arg.conv_parser Arg.int in
+  let printer = Arg.conv_printer Arg.int in
   let parser s =
     match parser s with
     | Error _ -> Error "expected a strictly positive integer"
     | Ok n as r -> if n <= 0
       then Error "expected a positive integer"
       else r in
-  Arg.conv' (parser, Arg.conv_printer Arg.int)
+  Arg.conv' (parser, printer)
 
 (* name * version option *)
 let package =
@@ -873,8 +874,8 @@ let atom_or_local =
         Ok (`Dirname (OpamFilename.Dir.of_string str))
       else
         Error (Printf.sprintf
-                  "Not a valid package specification or existing file or \
-                   directory: %s" str)
+                 "Not a valid package specification or existing file or \
+                  directory: %s" str)
     else match Arg.conv_parser atom str with
       | Ok at -> Ok (`Atom at)
       | Error (`Msg e) -> Error e
@@ -890,14 +891,15 @@ let atom_or_dir =
   let parse str = match Arg.conv_parser atom_or_local str with
     | Ok (`Filename _) ->
       Error (Printf.sprintf
-                "Not a valid package specification or existing directory: %s"
-                str)
+               "Not a valid package specification or existing directory: %s"
+               str)
     | Ok (`Atom _ | `Dirname _ as atom_or_dir) -> Ok (atom_or_dir)
     | Error (`Msg e) -> Error e
   in
-  let print ppf = function
-    | `Dirname d -> pr_str ppf (OpamFilename.Dir.to_string d)
-    | `Atom a -> Arg.conv_printer atom ppf a in
+  let print ppf
+    :> [ `Atom of OpamTypes.atom | `Dirname of OpamTypes.dirname ] -> unit
+    = Arg.conv_printer atom_or_local ppf
+  in
   Arg.conv' (parse, print)
 
 let dep_formula =
@@ -1003,6 +1005,16 @@ let _selector =
   in
   Arg.conv' (parse, print)
 
+(* unused
+let enum_with_default sl: 'a Arg.converter =
+  let parse, print = Arg.enum sl in
+  let parse s =
+    match parse s with
+    | `Ok _ as x -> x
+    | _ -> `Ok (`default s) in
+  parse, print
+*)
+
 let opamlist_column =
   let parse str =
     if OpamCompat.String.ends_with ~suffix:":" str then
@@ -1016,9 +1028,9 @@ let opamlist_column =
       |> fun (f, _) -> Ok f
     with Not_found ->
       Error (Printf.sprintf
-                "No known printer for column %s. If you meant an opam file \
-                 field, use '%s:' instead (with a trailing colon)."
-                str str)
+               "No known printer for column %s. If you meant an opam file \
+                field, use '%s:' instead (with a trailing colon)."
+               str str)
   in
   let print ppf field =
     Format.pp_print_string ppf (OpamListCommand.string_of_field field)
@@ -1058,7 +1070,9 @@ let opamlist_columns =
   let print ppf cols =
     let rec aux = function
       | x::(_::_) as r ->
-        Arg.conv_printer opamlist_column ppf x; Format.pp_print_char ppf ','; aux r
+        Arg.conv_printer opamlist_column ppf x;
+        Format.pp_print_char ppf ',';
+        aux r
       | [x] -> Arg.conv_printer opamlist_column ppf x
       | [] -> ()
     in
@@ -1668,26 +1682,21 @@ let package_selection cli =
       Arg.(pair ~sep:':' string string)
   in
   let has_flag =
-    let flag_arg =
-      let parser s =
-        match pkg_flag_of_string s with
-          | Pkgflag_Unknown s ->
-            Error ("Invalid package flag "^s^", must be one of "^
-                    OpamStd.List.concat_map " " string_of_pkg_flag
-                      all_package_flags)
-          | f -> Ok f in
-      let printer fmt flag =
-        Format.pp_print_string fmt (string_of_pkg_flag flag)
-      in
-      Arg.conv' (parser, printer)
-    in
     mk_opt_all ~cli cli_original ["has-flag"] "FLAG" ~section
       ("Only include packages which have the given flag set. \
         Package flags are one of: "^
        (OpamStd.List.concat_map " "
           (Printf.sprintf "$(b,%s)" @* string_of_pkg_flag)
           all_package_flags))
-      flag_arg
+      (Arg.conv'
+         ((fun s -> match pkg_flag_of_string s with
+             | Pkgflag_Unknown s ->
+               Error ("Invalid package flag "^s^", must be one of "^
+                      OpamStd.List.concat_map " " string_of_pkg_flag
+                        all_package_flags)
+             | f -> Ok f),
+          (fun fmt flag ->
+             Format.pp_print_string fmt (string_of_pkg_flag flag))))
   in
   let has_tag =
     mk_opt_all ~cli cli_original ["has-tag"] "TAG" ~section

src/client/opamArgTools.ml

@@ -709,14 +709,16 @@ type 'a default = [> `default of string] as 'a
 
 let mk_subcommands_with_default ~cli commands =
   let enum_with_default_valrem sl =
-    let base = Arg.enum sl in
-    let parse = Arg.conv_parser base in
+    let parse, print =
+      let base = Arg.enum sl in
+      (Arg.conv_parser base, Arg.conv_printer base)
+    in
     let parse s =
       match parse s with
       | Ok x -> Ok (x)
       | _ -> Ok (Valid (`default s)) in
-      Arg.conv (parse, Arg.conv_printer base)
-    in
+    Arg.conv (parse, print)
+  in
   mk_subcommands_aux ~cli enum_with_default_valrem commands
 
 let bad_subcommand ~cli subcommands (command, usersubcommand, userparams) =

src/client/opamCommands.ml

@@ -1739,7 +1739,7 @@ let env cli =
       "Exits with 0 if the environment is already up-to-date, 1 otherwise, \
        after printing the list of not up-to-date variables."
   in
-  let run_env
+  let env
       global_options shell sexp inplace_path set_opamroot set_opamswitch
       revert check () =
     apply_global_options cli global_options;
@@ -1772,11 +1772,12 @@ let env cli =
         (OpamEnv.add [] [])
   in
   let open Common_config_flags in
+  let ( $ ) = OpamCmdliner.Term.( $ ) in
   mk_command  ~cli cli_original "env" ~doc ~man
-  Term.(const run_env
-        $global_options cli $shell_opt cli cli_original $sexp cli
-        $inplace_path cli $set_opamroot cli $set_opamswitch cli
-        $revert $check)
+    (Term.const env
+     $global_options cli $shell_opt cli cli_original $sexp cli
+     $inplace_path cli $set_opamroot cli $set_opamswitch cli
+     $revert $check)
 
 (* INSTALL *)
 let install_doc = "Install a list of packages."
@@ -4498,7 +4499,10 @@ let help =
     | None       -> `Help (`Pager, None)
     | Some topic ->
       let topics = "topics" :: cmds in
-      let conv = OpamCmdliner.Arg.conv_parser @@ OpamCmdliner.Arg.enum (List.rev_map (fun s -> (s, s)) topics) in
+      let conv =
+        OpamCmdliner.Arg.conv_parser
+          (OpamCmdliner.Arg.enum (List.rev_map (fun s -> (s, s)) topics))
+      in
       match conv topic with
       | Error (`Msg e) -> `Error (false, e)
       | Ok t when t = "topics" ->