Merge pull request #312 from gpetiot/rm-rule

Remove deprecated 'rule' command

Author: gpetiot

CHANGES.md

@@ -17,6 +17,7 @@
 - Dropped compatibility with older OCaml versions. The minimal supported range
   is 4.08 to 4.13 now (#345, @Leonidas-from-XIV)
 - Do not install deprecated `mdx` binary anymore (#274, @gpetiot)
+- Remove deprecated `rule` command (#312, @gpetiot)
 
 #### Security
 

bin/main.ml

@@ -16,7 +16,7 @@
 
 open Cmdliner
 
-let cmds = [ Test.cmd; Pp.cmd; Rule.cmd; Deps.cmd; Dune_gen.cmd ]
+let cmds = [ Test.cmd; Pp.cmd; Deps.cmd; Dune_gen.cmd ]
 
 let main (`Setup ()) = `Help (`Pager, None)
 

bin/rule.ml

@@ -76,8 +76,6 @@ type t = {
   loc : Location.t;
   section : section option;
   dir : string option;
-  source_trees : string list;
-  required_packages : string list;
   labels : Label.t list;
   legacy_labels : bool;
   contents : string list;
@@ -200,8 +198,6 @@ let directory t = t.dir
 
 let file t = match t.value with Include t -> Some t.file_included | _ -> None
 
-let source_trees t = t.source_trees
-
 let non_det t =
   match t.value with
   | OCaml b -> b.non_det
@@ -215,32 +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 "\"" ]
-
-let require_from_line line =
-  let open Util.Result.Infix in
-  let re = Re.compile require_re in
-  match Re.exec_opt re line with
-  | None -> Ok Library.Set.empty
-  | Some group ->
-      let matched = Re.Group.get group 1 in
-      let libs_str = String.split_on_char ',' matched in
-      Util.Result.List.map ~f:Library.from_string libs_str >>| fun libs ->
-      Library.Set.of_list libs
-
-let require_from_lines lines =
-  let open Util.Result.Infix in
-  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
@@ -320,8 +290,6 @@ type block_config = {
   dir : string option;
   skip : bool;
   version : (Label.Relation.t * Ocaml_version.t) option;
-  source_trees : string list;
-  required_packages : string list;
   set_variables : (string * string) list;
   unset_variables : string list;
   file_inc : string option;
@@ -341,12 +309,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;
-    source_trees =
-      List.filter_map (function Label.Source_tree x -> Some x | _ -> 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 =
@@ -449,8 +411,6 @@ let mk ~loc ~section ~labels ~legacy_labels ~header ~contents ~errors =
     loc;
     section;
     dir = config.dir;
-    source_trees = config.source_trees;
-    required_packages = config.required_packages;
     labels;
     legacy_labels;
     contents;