Make Ocamldep.rules already_used arg optional

String_set.empty is a good default value
This commit is contained in:
Jérémie Dimino 2018-02-23 16:10:33 +07:00 committed by Rudi Grinberg
parent 6e7d297ea3
commit 0c30689404
2 changed files with 8 additions and 7 deletions

View File

@ -114,8 +114,9 @@ let parse_deps ~dir ~file ~(unit : Module.t)
in in
deps deps
let rules sctx ~(ml_kind:Ml_kind.t) ~dir ~modules ~already_used let rules ~(ml_kind:Ml_kind.t) ~dir ~modules
~alias_module ~lib_interface_module = ?(already_used=String_set.empty)
~alias_module ~lib_interface_module sctx =
let per_module = let per_module =
String_map.map modules ~f:(fun unit -> String_map.map modules ~f:(fun unit ->
match Module.file ~dir unit ml_kind with match Module.file ~dir unit ml_kind with
@ -143,6 +144,6 @@ let rules sctx ~(ml_kind:Ml_kind.t) ~dir ~modules ~already_used
; per_module ; per_module
} }
let rules sctx ~dir ~modules ~already_used ~alias_module ~lib_interface_module = let rules ~dir ~modules ?already_used ~alias_module ~lib_interface_module sctx =
Ml_kind.Dict.of_func (rules sctx ~dir ~modules ~already_used ~alias_module Ml_kind.Dict.of_func (rules sctx ~dir ~modules ?already_used ~alias_module
~lib_interface_module) ~lib_interface_module)

View File

@ -35,10 +35,10 @@ end
Return arrows that evaluate to the dependency graphs. *) Return arrows that evaluate to the dependency graphs. *)
val rules val rules
: Super_context.t : dir:Path.t
-> dir:Path.t
-> modules:Module.t String_map.t -> modules:Module.t String_map.t
-> already_used:String_set.t -> ?already_used:String_set.t
-> alias_module:Module.t option -> alias_module:Module.t option
-> lib_interface_module:Module.t option -> lib_interface_module:Module.t option
-> Super_context.t
-> Dep_graphs.t -> Dep_graphs.t