Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion bin/describe/describe_workspace.ml
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,9 @@ module Crawl = struct
let+ requires =
let* compile_info = Exe_rules.compile_info ~scope exes in
let open Resolve.Memo.O in
let* requires = Lib.Compile.direct_requires compile_info in
let* requires =
Lib.Compile.direct_requires compile_info |> Resolve.Memo.map ~f:Loc.L.drop
in
if options.with_pps
then
let+ pps = Lib.Compile.pps compile_info in
Expand Down
5 changes: 5 additions & 0 deletions otherlibs/stdune/src/loc.ml
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,8 @@ let rec render ppf pp =
Pp.to_fmt_with_tags ppf pp ~tag_handler:(fun ppf Loc pp ->
Format.fprintf ppf "@{<loc>%a@}" render pp)
;;

module L = struct
let drop x = List.map ~f:snd x
let add_none x = List.map ~f:(fun x -> none, x) x
end
8 changes: 8 additions & 0 deletions otherlibs/stdune/src/loc.mli
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,11 @@ val on_same_line : t -> t -> bool
val compare : t -> t -> Ordering.t
val span : t -> t -> t
val set_start_to_stop : t -> t

module L : sig
type loc := t
type 'a t := (loc * 'a) list

val drop : 'a t -> 'a list
val add_none : 'a list -> 'a t
end
4 changes: 3 additions & 1 deletion src/dune_rules/bootstrap_info.ml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ let include_subdirs dir_contents =
let make_root_module sctx ~name compile_info =
let open Action_builder.O in
let+ entries =
let requires_compile = Lib.Compile.direct_requires compile_info in
let requires_compile =
Lib.Compile.direct_requires compile_info |> Resolve.Memo.map ~f:Loc.L.drop
in
Root_module.entries sctx ~requires_compile
in
{ Root_module_data.name; entries }
Expand Down
4 changes: 3 additions & 1 deletion src/dune_rules/cinaps.ml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ let gen_rules sctx t ~dir ~scope =
in
Pp_spec.pp_module preprocess module_ >>| Modules.With_vlib.singleton_exe
in
let requires_compile = Lib.Compile.direct_requires compile_info in
let requires_compile =
Lib.Compile.direct_requires compile_info |> Resolve.Memo.map ~f:Loc.L.drop
in
let requires_link = Lib.Compile.requires_link compile_info in
let obj_dir = Obj_dir.make_exe ~dir:cinaps_dir ~name in
Compilation_context.create
Expand Down
4 changes: 3 additions & 1 deletion src/dune_rules/exe_rules.ml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ let executables_rules
in
let programs = programs ~modules ~exes in
let* cctx =
let requires_compile = Lib.Compile.direct_requires compile_info in
let requires_compile =
Lib.Compile.direct_requires compile_info |> Resolve.Memo.map ~f:Loc.L.drop
in
let requires_link = Lib.Compile.requires_link compile_info in
let instances =
Parameterised_rules.instances ~sctx ~db:(Scope.libs scope) exes.buildable.libraries
Expand Down
Loading
Loading