Remove ~has_dot_merlin flag

it was introduced to avoid generaitng a needless .merlin file for utop levels.
But now that we have a better mechanism for that, it serves no purpose.
This commit is contained in:
Rudi Grinberg 2018-04-10 02:01:33 +07:00
parent 02b04e1eff
commit 9acf617563
3 changed files with 4 additions and 5 deletions

View File

@ -787,7 +787,7 @@ module Gen(P : Install_rules.Params) = struct
~allow_overlaps:lib.buildable.allow_overlapping_dependencies
in
SC.Libs.gen_select_rules sctx compile_info ~dir;
SC.Libs.with_lib_deps sctx compile_info ~dir ~has_dot_merlin:true
SC.Libs.with_lib_deps sctx compile_info ~dir
~f:(fun () ->
library_rules lib ~modules_partitioner ~dir ~files ~scope ~compile_info)
@ -900,7 +900,7 @@ module Gen(P : Install_rules.Params) = struct
~allow_overlaps:exes.buildable.allow_overlapping_dependencies
in
SC.Libs.gen_select_rules sctx compile_info ~dir;
SC.Libs.with_lib_deps sctx compile_info ~dir ~has_dot_merlin:true
SC.Libs.with_lib_deps sctx compile_info ~dir
~f:(fun () ->
executables_rules exes ~dir ~all_modules
?modules_partitioner ~scope ~compile_info)

View File

@ -272,7 +272,7 @@ module Libs = struct
raise (Lib.Error (No_solution_found_for_select e))
}))
let with_lib_deps t compile_info ~dir ~has_dot_merlin ~f =
let with_lib_deps t compile_info ~dir ~f =
let prefix =
Build.record_lib_deps (Lib.Compile.user_written_deps compile_info)
~kind:(if Lib.Compile.optional compile_info then
@ -281,7 +281,7 @@ module Libs = struct
Required)
in
let prefix =
if t.context.merlin && has_dot_merlin then
if t.context.merlin then
Build.path (Path.relative dir ".merlin-exists")
>>>
prefix

View File

@ -137,7 +137,6 @@ module Libs : sig
: t
-> Lib.Compile.t
-> dir:Path.t
-> has_dot_merlin:bool
-> f:(unit -> 'a)
-> 'a