The unpac monorepo manager self-hosting as a monorepo using unpac
Move term type definition from Cmdliner_term to Cmdliner_cline (#215)
+31
-12
+12
-1
vendor/opam/cmdliner/src/cmdliner_cline.ml
+12
-1
vendor/opam/cmdliner/src/cmdliner_cline.ml
···
40
40
let kind = "option name" in
41
41
Cmdliner_base.err_multi_def ~kind name Cmdliner_info.Arg.doc a a'
42
42
43
-
module Amap = Map.Make (Cmdliner_info.Arg)
43
+
module Amap = Cmdliner_info.Arg.Map
44
44
45
45
type arg = (* unconverted argument data as found on the command line. *)
46
46
| O of (int * string * (string option)) list (* (pos, name, value) of opt. *)
···
366
366
Fmt.pf ppf "@[%a @[argument%s %a: %a@]@]"
367
367
Fmt.deprecated () plural Fmt.(list ~sep:sp code_or_quote) args
368
368
Fmt.styled_text msg
369
+
370
+
371
+
type term_escape =
372
+
[ `Error of bool * string
373
+
| `Help of Cmdliner_manpage.format * string option ]
374
+
375
+
type 'a parser =
376
+
Cmdliner_info.Eval.t -> t ->
377
+
('a, [ `Parse of string | term_escape ]) result
378
+
379
+
type 'a term = Cmdliner_info.Arg.Set.t * 'a parser
+12
vendor/opam/cmdliner/src/cmdliner_cline.mli
+12
vendor/opam/cmdliner/src/cmdliner_cline.mli
···
41
41
val pp_deprecated :
42
42
subst:Cmdliner_manpage.subst -> deprecated Cmdliner_base.Fmt.t
43
43
(** [pp_deprecated] formats deprecations. *)
44
+
45
+
(** {1:terms Terms} *)
46
+
47
+
type term_escape =
48
+
[ `Error of bool * string
49
+
| `Help of Cmdliner_manpage.format * string option ]
50
+
51
+
type 'a parser =
52
+
Cmdliner_info.Eval.t -> t ->
53
+
('a, [ `Parse of string | term_escape ]) result
54
+
55
+
type 'a term = Cmdliner_info.Arg.Set.t * 'a parser
+2
-1
vendor/opam/cmdliner/src/cmdliner_info.ml
+2
-1
vendor/opam/cmdliner/src/cmdliner_info.ml
···
268
268
let styled_doc ~errs ~subst i =
269
269
Cmdliner_manpage.doc_to_styled ~errs ~subst i.doc
270
270
271
+
module T = struct type nonrec t = t let compare = compare end
272
+
module Map = Map.Make (T)
271
273
module Set = struct
272
274
type arg = t
273
275
type completion = V : 'a Completion.t -> completion
274
276
275
-
module Map = Map.Make (struct type t = arg let compare = compare end)
276
277
include Map
277
278
278
279
type t = completion Map.t
+2
-2
vendor/opam/cmdliner/src/cmdliner_info.mli
+2
-2
vendor/opam/cmdliner/src/cmdliner_info.mli
···
161
161
val styled_doc :
162
162
errs:Format.formatter -> subst:Cmdliner_manpage.subst -> t -> string
163
163
164
+
module Map : Map.S with type key := t
164
165
module Set : sig
165
166
type arg = t
166
167
type completion = V : 'a Completion.t -> completion
167
-
168
168
type t
169
169
val is_empty : t -> bool
170
170
val empty : t
···
178
178
val elements : t -> arg list
179
179
val union : t -> t -> t
180
180
val find_opt : arg -> t -> completion option
181
-
end
181
+
end with type arg := t
182
182
end
183
183
184
184
(** Commands. *)
+3
-8
vendor/opam/cmdliner/src/cmdliner_term.ml
+3
-8
vendor/opam/cmdliner/src/cmdliner_term.ml
···
3
3
SPDX-License-Identifier: ISC
4
4
---------------------------------------------------------------------------*)
5
5
6
-
type term_escape =
7
-
[ `Error of bool * string
8
-
| `Help of Cmdliner_manpage.format * string option ]
6
+
type term_escape = Cmdliner_cline.term_escape
7
+
type 'a parser = 'a Cmdliner_cline.parser
8
+
type +'a t = 'a Cmdliner_cline.term
9
9
10
-
type 'a parser =
11
-
Cmdliner_info.Eval.t -> Cmdliner_cline.t ->
12
-
('a, [ `Parse of string | term_escape ]) result
13
-
14
-
type +'a t = Cmdliner_info.Arg.Set.t * 'a parser
15
10
let make args p = (args, p)
16
11
let argset (args, _) = args
17
12
let parser (_, parser) = parser