From 0c3068940466d92b2ad535bc2bc4cd25ecd0eed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Dimino?= Date: Fri, 23 Feb 2018 16:10:33 +0700 Subject: [PATCH] Make Ocamldep.rules already_used arg optional String_set.empty is a good default value --- src/ocamldep.ml | 9 +++++---- src/ocamldep.mli | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ocamldep.ml b/src/ocamldep.ml index ea063d28..bfbbbf9a 100644 --- a/src/ocamldep.ml +++ b/src/ocamldep.ml @@ -114,8 +114,9 @@ let parse_deps ~dir ~file ~(unit : Module.t) in deps -let rules sctx ~(ml_kind:Ml_kind.t) ~dir ~modules ~already_used - ~alias_module ~lib_interface_module = +let rules ~(ml_kind:Ml_kind.t) ~dir ~modules + ?(already_used=String_set.empty) + ~alias_module ~lib_interface_module sctx = let per_module = String_map.map modules ~f:(fun unit -> 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 } -let rules sctx ~dir ~modules ~already_used ~alias_module ~lib_interface_module = - Ml_kind.Dict.of_func (rules sctx ~dir ~modules ~already_used ~alias_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 ~lib_interface_module) diff --git a/src/ocamldep.mli b/src/ocamldep.mli index e004ddd5..85ddfe41 100644 --- a/src/ocamldep.mli +++ b/src/ocamldep.mli @@ -35,10 +35,10 @@ end Return arrows that evaluate to the dependency graphs. *) val rules - : Super_context.t - -> dir:Path.t + : dir:Path.t -> modules:Module.t String_map.t - -> already_used:String_set.t + -> ?already_used:String_set.t -> alias_module:Module.t option -> lib_interface_module:Module.t option + -> Super_context.t -> Dep_graphs.t