The unpac monorepo manager self-hosting as a monorepo using unpac
Tweak signature of Arg.Conv.of_conv
+17
-17
+2
-2
vendor/opam/cmdliner/src/cmdliner.mli
+2
-2
vendor/opam/cmdliner/src/cmdliner.mli
···
775
775
given properties. See corresponding accessors for semantics. *)
776
776
777
777
val of_conv :
778
-
'a t -> ?completion:'a Completion.t -> ?docv:string ->
779
-
?parser:'a parser -> ?pp:'a fmt -> unit -> 'a t
778
+
?completion:'a Completion.t -> ?docv:string ->
779
+
?parser:'a parser -> ?pp:'a fmt -> 'a t -> 'a t
780
780
(** [of_conv conv ()] is a new converter with given unspecified
781
781
properties defaulting to those of [conv]. *)
782
782
+2
-2
vendor/opam/cmdliner/src/cmdliner_arg.mli
+2
-2
vendor/opam/cmdliner/src/cmdliner_arg.mli
···
46
46
?completion:'a Completion.t -> docv:string -> parser:'a parser ->
47
47
pp:'a fmt -> unit -> 'a t
48
48
49
-
val of_conv : 'a t ->
49
+
val of_conv :
50
50
?completion:'a Completion.t -> ?docv:string -> ?parser:'a parser ->
51
-
?pp:'a fmt -> unit -> 'a t
51
+
?pp:'a fmt -> 'a t -> 'a t
52
52
53
53
val docv : 'a conv -> string
54
54
val parser : 'a conv -> 'a parser
+5
-4
vendor/opam/cmdliner/src/cmdliner_def.ml
+5
-4
vendor/opam/cmdliner/src/cmdliner_def.ml
···
428
428
?(completion = Arg_completion.complete_none) ~docv ~parser ~pp () : 'a t =
429
429
{ docv; parser; pp; completion }
430
430
431
-
let of_conv
432
-
(conv : 'a t)
433
-
?(completion = conv.completion) ?(docv = conv.docv)
434
-
?(parser = conv.parser) ?(pp = conv.pp) () : 'a t
431
+
let of_conv ?completion ?docv ?parser ?pp (conv : 'a t) : 'a t
435
432
=
433
+
let completion = Option.value ~default:conv.completion completion in
434
+
let docv = Option.value ~default:conv.docv docv in
435
+
let parser = Option.value ~default:conv.parser parser in
436
+
let pp = Option.value ~default:conv.pp pp in
436
437
{ docv; parser; pp; completion }
437
438
438
439
let docv (c : 'a t) = c.docv
+4
-5
vendor/opam/cmdliner/src/cmdliner_def.mli
+4
-5
vendor/opam/cmdliner/src/cmdliner_def.mli
···
251
251
pp:'a fmt -> unit -> 'a t
252
252
253
253
val of_conv :
254
-
'a t -> ?completion:'a Arg_completion.t -> ?docv:string ->
255
-
?parser:'a parser -> ?pp:'a fmt -> unit -> 'a t
254
+
?completion:'a Arg_completion.t -> ?docv:string ->
255
+
?parser:'a parser -> ?pp:'a fmt -> 'a t -> 'a t
256
256
257
257
val docv : 'a t -> string
258
258
val parser : 'a t -> 'a parser
···
273
273
| Opt_name
274
274
275
275
type t
276
-
277
276
val make :
278
-
?after_dashdash:bool -> ?subcmds:bool -> Cline.t -> token:string ->
279
-
kind -> t
277
+
?after_dashdash:bool -> ?subcmds:bool -> Cline.t -> token:string -> kind ->
278
+
t
280
279
281
280
val cline : t -> Cline.t
282
281
val token : t -> string
+1
-1
vendor/opam/cmdliner/test/test_arg.ml
+1
-1
vendor/opam/cmdliner/test/test_arg.ml
···
352
352
let test_conv_docv =
353
353
Test.test "Arg.Conv.docv" @@ fun () ->
354
354
let cmd =
355
-
let field = Arg.Conv.of_conv Arg.string ~docv:"FIELD" () in
355
+
let field = Arg.Conv.of_conv Arg.string ~docv:"FIELD" in
356
356
Cmd.make (Cmd.info "test_conv_docv" ~doc:"Test conv docv") @@
357
357
let+ all = Arg.(value & pos_all field [] & info [])
358
358
and+ opt = Arg.(value & opt field "bla" & info ["field"]) in
+2
-2
vendor/opam/cmdliner/test/test_completion.ml
+2
-2
vendor/opam/cmdliner/test/test_completion.ml
···
337
337
and+ args =
338
338
let arg =
339
339
let completion = Arg.Completion.complete_restart in
340
-
Arg.Conv.of_conv ~docv:"ARG" Arg.string ~completion ()
340
+
Arg.Conv.of_conv Arg.string ~docv:"ARG" ~completion
341
341
in
342
342
Arg.(value & pos_right 0 arg [] & info [])
343
343
in
···
402
402
Cmd.make (Cmd.info "test_restart") @@
403
403
let arg ~docv =
404
404
let completion = Arg.Completion.complete_restart in
405
-
Arg.Conv.of_conv ~docv:"TOOL" Arg.string ~completion ()
405
+
Arg.Conv.of_conv Arg.string ~docv:"TOOL" ~completion
406
406
in
407
407
let+ verb = Arg.(value & flag & info ["verbose"])
408
408
and+ tool = Arg.(required & pos 0 (some (arg ~docv:"TOOL")) None & info [])
+1
-1
vendor/opam/cmdliner/test/testing_cmdliner.ml
+1
-1
vendor/opam/cmdliner/test/testing_cmdliner.ml