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

Remove extra is standard check that is already done in Osl.eval 

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
Rudi Grinberg 2018-07-18 13:11:05 +02:00
parent 5dd218c0b8
commit 621c666610
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/dir_contents.ml
View File

@ -417,22 +417,19 @@ let build_mlds_map (d : Super_context.Dir_with_jbuild.t) ~files =
in in
List.filter_map d.stanzas ~f:(function List.filter_map d.stanzas ~f:(function
| Documentation doc -> | Documentation doc ->
let mlds = Lazy.force mlds in
let mlds = let mlds =
if Ordered_set_lang.is_standard doc.mld_files then let mlds = Lazy.force mlds in
mlds Ordered_set_lang.String.eval_unordered doc.mld_files
else ~parse:(fun ~loc s ->
Ordered_set_lang.String.eval_unordered doc.mld_files match String.Map.find mlds s with
~parse:(fun ~loc s -> | Some s ->
match String.Map.find mlds s with s
| Some s -> | None ->
s Loc.fail loc "%s.mld doesn't exist in %s" s
| None -> (Path.to_string_maybe_quoted
Loc.fail loc "%s.mld doesn't exist in %s" s (Path.drop_optional_build_context dir))
(Path.to_string_maybe_quoted )
(Path.drop_optional_build_context dir)) ~standard:mlds
)
~standard:mlds
in in
Some (doc, List.map (String.Map.values mlds) ~f:(Path.relative dir)) Some (doc, List.map (String.Map.values mlds) ~f:(Path.relative dir))
| _ -> None) | _ -> None)