From 443dd96685247989d10a2afc83747015de5525b7 Mon Sep 17 00:00:00 2001 From: Arseniy Alekseyev Date: Wed, 8 May 2019 13:39:05 +0100 Subject: [PATCH] rename Signed-off-by: Arseniy Alekseyev --- src/install_rules.ml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/install_rules.ml b/src/install_rules.ml index c7a7a8a62a1f..a942bb6b3748 100644 --- a/src/install_rules.ml +++ b/src/install_rules.ml @@ -363,7 +363,6 @@ let install_entries sctx package = | Opam -> [(None, Install.Entry.make Lib (Path.build opam_file) ~dst:"opam")]) in - let install_paths = Local_package.install_paths package in coqlib_install_files |> List.rev_append lib_install_files |> List.rev_append installs @@ -465,7 +464,7 @@ let install_alias (ctx : Context.t) (package : Local_package.t) = module Result =struct type t = { - files_in_package : Path.t list Memo.Lazy.t; + package_source_files : Path.t list Memo.Lazy.t; scheme : Rules.Dir_rules.t Scheme.t; } @@ -487,14 +486,14 @@ let memo = Rules.collect (fun () -> install_rules sctx pkg; install_alias ctx pkg; - package_source_files sctx pkg + )) in - let files_in_package = Memo.lazy_ (fun () -> - fst (Memo.Lazy.force files_and_rules)) + let package_source_files = Memo.lazy_ (fun () -> + package_source_files sctx pkg) in { - files_in_package; + package_source_files; scheme = ( Approximation ( (Dir_set.union_all @@ -546,7 +545,7 @@ let packages = Package.Name.Map.foldi (Local_package.of_sctx sctx) ~init:[] ~f:(fun name pkg acc -> - List.fold_left (Memo.Lazy.force (run sctx pkg).files_in_package) + List.fold_left (Memo.Lazy.force (run sctx pkg).package_source_files) ~init:acc ~f:(fun acc path -> (path, name) :: acc)) |> Path.Map.of_list_multi in