Remove {anonymous,external}_scope from Super_context
These were re-exported to avoid access libs directly, but there's already an accessor to do that, so these functions weren't used consistently anyway.
This commit is contained in:
parent
dad2458879
commit
fd6e8ad91f
|
@ -228,9 +228,6 @@ module Libs = struct
|
||||||
open Build.O
|
open Build.O
|
||||||
open Lib_db
|
open Lib_db
|
||||||
|
|
||||||
let anonymous_scope t = Lib_db.anonymous_scope t.libs
|
|
||||||
let external_scope t = Lib_db.external_scope t.libs
|
|
||||||
|
|
||||||
let vrequires t ~dir ~item =
|
let vrequires t ~dir ~item =
|
||||||
let fn = Path.relative dir (item ^ ".requires.sexp") in
|
let fn = Path.relative dir (item ^ ".requires.sexp") in
|
||||||
Build.Vspec.T (fn, t.libs_vfile)
|
Build.Vspec.T (fn, t.libs_vfile)
|
||||||
|
@ -849,7 +846,7 @@ module PP = struct
|
||||||
let (key, scope) =
|
let (key, scope) =
|
||||||
match String.rsplit2 key ~on:'@' with
|
match String.rsplit2 key ~on:'@' with
|
||||||
| None ->
|
| None ->
|
||||||
(key, Libs.external_scope sctx)
|
(key, Lib_db.external_scope sctx.libs)
|
||||||
| Some (key, scope) ->
|
| Some (key, scope) ->
|
||||||
(key, Lib_db.find_scope_by_name_exn sctx.libs ~name:scope) in
|
(key, Lib_db.find_scope_by_name_exn sctx.libs ~name:scope) in
|
||||||
let names =
|
let names =
|
||||||
|
|
|
@ -100,8 +100,6 @@ val resolve_program
|
||||||
val unique_library_name : t -> Lib.t -> string
|
val unique_library_name : t -> Lib.t -> string
|
||||||
|
|
||||||
module Libs : sig
|
module Libs : sig
|
||||||
val anonymous_scope : t -> Lib_db.Scope.t
|
|
||||||
val external_scope : t -> Lib_db.Scope.t
|
|
||||||
|
|
||||||
val load_requires : t -> dir:Path.t -> item:string -> (unit, Lib.t list) Build.t
|
val load_requires : t -> dir:Path.t -> item:string -> (unit, Lib.t list) Build.t
|
||||||
val load_runtime_deps : t -> dir:Path.t -> item:string -> (unit, Lib.t list) Build.t
|
val load_runtime_deps : t -> dir:Path.t -> item:string -> (unit, Lib.t list) Build.t
|
||||||
|
|
Loading…
Reference in New Issue