From 3fd3d5b44c6bd3946d3b4f13fd98a42bafb6017b Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 26 Feb 2018 14:55:40 +0700 Subject: [PATCH] Don't pass lib_name if lib is already passed We can easily get the library name --- src/odoc.ml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/odoc.ml b/src/odoc.ml index 2b6ec04c..261acb77 100644 --- a/src/odoc.ml +++ b/src/odoc.ml @@ -122,10 +122,11 @@ let to_html sctx (m : Module_or_mld.t) odoc_file ~doc_dir ~odoc ~dir ~includes ); html_file -let all_mld_files sctx ~(lib : Library.t) ~lib_name ~modules ~dir files = +let all_mld_files sctx ~(lib : Library.t) ~modules ~dir files = let all_files = if List.mem "index.mld" ~set:files then files else "index.mld" :: files in + let lib_name = Library.best_name lib in let doc_dir = SC.Doc.dir sctx lib in List.map all_files ~f:(fun file -> let name = Filename.chop_extension file in @@ -178,7 +179,6 @@ let setup_library_rules sctx (lib : Library.t) ~dir ~scope ~modules ~mld_files in (obj_dir, name) in - let lib_name = Library.best_name lib in let odoc = get_odoc sctx in let includes = let ctx = SC.context sctx in @@ -188,7 +188,7 @@ let setup_library_rules sctx (lib : Library.t) ~dir ~scope ~modules ~mld_files >>^ Lib.L.include_flags ~stdlib_dir:ctx.stdlib_dir) in let mld_files = - all_mld_files sctx ~dir ~lib ~lib_name ~modules mld_files + all_mld_files sctx ~dir ~lib ~modules mld_files in let mld_and_odoc_files = List.map mld_files ~f:(fun m ->