Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
Signed-off-by: Arseniy Alekseyev <aalekseyev@janestreet.com>
  • Loading branch information
aalekseyev committed May 8, 2019
1 parent 870b966 commit 443dd96
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions src/install_rules.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 443dd96

Please sign in to comment.