Remove Block.required_packages

Author: gpetiot

lib/block.ml

@@ -76,7 +76,6 @@ type t = {
   loc : Location.t;
   section : section option;
   dir : string option;
-  required_packages : string list;
   labels : Label.t list;
   legacy_labels : bool;
   contents : string list;
@@ -212,8 +211,6 @@ let set_variables t = t.set_variables
 
 let unset_variables t = t.unset_variables
 
-let explicit_required_packages t = t.required_packages
-
 let require_re =
   let open Re in
   seq [ str "#require \""; group (rep1 any); str "\"" ]
@@ -234,10 +231,6 @@ let require_from_lines lines =
   Util.Result.List.map ~f:require_from_line lines >>| fun libs ->
   List.fold_left Library.Set.union Library.Set.empty libs
 
-let required_libraries = function
-  | { value = Toplevel _; contents; _ } -> require_from_lines contents
-  | _ -> Ok Library.Set.empty
-
 let value t = t.value
 
 let section t = t.section
@@ -317,7 +310,6 @@ type block_config = {
   dir : string option;
   skip : bool;
   version : (Label.Relation.t * Ocaml_version.t) option;
-  required_packages : string list;
   set_variables : (string * string) list;
   unset_variables : string list;
   file_inc : string option;
@@ -337,10 +329,6 @@ let get_block_config l =
     dir = get_label (function Dir x -> Some x | _ -> None) l;
     skip = List.exists (function Label.Skip -> true | _ -> false) l;
     version = get_label (function Version (x, y) -> Some (x, y) | _ -> None) l;
-    required_packages =
-      List.filter_map
-        (function Label.Require_package x -> Some x | _ -> None)
-        l;
     set_variables =
       List.filter_map (function Label.Set (v, x) -> Some (v, x) | _ -> None) l;
     unset_variables =
@@ -443,7 +431,6 @@ let mk ~loc ~section ~labels ~legacy_labels ~header ~contents ~errors =
     loc;
     section;
     dir = config.dir;
-    required_packages = config.required_packages;
     labels;
     legacy_labels;
     contents;

lib/block.mli

@@ -78,7 +78,6 @@ type t = {
   loc : Location.t;
   section : section option;
   dir : string option;
-  required_packages : string list;
   labels : Label.t list;
   legacy_labels : bool;
   contents : string list;
@@ -147,15 +146,6 @@ val set_variables : t -> (string * string) list
 val unset_variables : t -> string list
 (** [unset_variable t] is the list of environment variable to unset *)
 
-val explicit_required_packages : t -> string list
-(** [explicit_required_packages t] returns the list of packages explicitly required by the user
-    through require-package labels in the block [t]. *)
-
-val required_libraries : t -> (Library.Set.t, string) Result.result
-(** [required_libraries t] returns the set of libaries that are loaded through [#require]
-    statements in the block [t]. Always returns an empty set if [t] isn't a toplevel
-    block. *)
-
 val skip : t -> bool
 (** [skip t] is true iff [skip] is in the labels of [t]. *)