matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove more Path <-> List conversion in rules_for_files 

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
Rudi Grinberg 2018-05-28 18:04:48 +07:00
parent 836b27ae2b
commit 4a0e5a76af
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/build_system.ml
View File

@ -1333,7 +1333,7 @@ end
module Rule_set = Set.Make(Rule) module Rule_set = Set.Make(Rule)
let rules_for_files rules paths = let rules_for_files rules paths =
List.fold_left paths ~init:Rule_set.empty ~f:(fun acc path -> Path.Set.fold paths ~init:Rule_set.empty ~f:(fun path acc ->
match Path.Map.find rules path with match Path.Map.find rules path with
| None -> acc | None -> acc
| Some rule -> Rule_set.add acc rule) | Some rule -> Rule_set.add acc rule)
@ -1402,10 +1402,10 @@ let build_rules_internal ?(recursive=false) t ~request =
in in
match match
Rule.Id.Top_closure.top_closure Rule.Id.Top_closure.top_closure
(rules_for_files rules (Path.Set.to_list !targets)) (rules_for_files rules !targets)
~key:(fun (r : Rule.t) -> r.id) ~key:(fun (r : Rule.t) -> r.id)
~deps:(fun (r : Rule.t) -> ~deps:(fun (r : Rule.t) ->
rules_for_files rules (Path.Set.to_list r.deps)) rules_for_files rules r.deps)
with with
| Ok l -> l | Ok l -> l
| Error cycle -> | Error cycle ->