Remove Block.require_from_lines

Author: gpetiot

lib/block.ml

@@ -211,26 +211,6 @@ let set_variables t = t.set_variables
 
 let unset_variables t = t.unset_variables
 
-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 value t = t.value
 
 let section t = t.section

lib/block.mli

@@ -161,13 +161,3 @@ val executable_contents : syntax:Syntax.t -> t -> string list
    (e.g. the phrase result is discarded). *)
 
 val is_active : ?section:string -> t -> bool
-
-(** {2 Parsers} *)
-
-val require_from_line : string -> (Library.Set.t, string) Result.result
-(** [require_from_line line] returns the set of libraries imported by the
-    #require statement on [line] or an empty set if [line] is not a require
-    statement. *)
-
-val require_from_lines : string list -> (Library.Set.t, string) Result.result
-(** Same as [require_from_line] but aggregated over several lines *)

test/lib/test_block.ml

@@ -17,37 +17,6 @@ let test_infer_from_file =
     make_test ~file:"foo/foo/foo.ml" ~expected:(Some OCaml);
   ]
 
-let test_require_from_line =
-  let make_test ~line ~expected () =
-    let open Mdx.Util.Result.Infix in
-    let test_name = Printf.sprintf "require_from_line: %S" line in
-    let expected = expected >>| Mdx.Library.Set.of_list in
-    let test_fun () =
-      let actual = Mdx.Block.require_from_line line in
-      Alcotest.(check (result Testable.library_set string))
-        test_name expected actual
-    in
-    (test_name, `Quick, test_fun)
-  in
-  [
-    make_test ~line:"let x = 2 + 2" ~expected:(Ok []) ();
-    make_test ~line:"#require \"a\""
-      ~expected:(Ok [ { base_name = "a"; sub_lib = None } ])
-      ();
-    make_test ~line:"# #require \"a\";;"
-      ~expected:(Ok [ { base_name = "a"; sub_lib = None } ])
-      ();
-    make_test ~line:"#require \"a,b.c,d\""
-      ~expected:
-        (Ok
-           [
-             { base_name = "a"; sub_lib = None };
-             { base_name = "b"; sub_lib = Some "c" };
-             { base_name = "d"; sub_lib = None };
-           ])
-      ();
-  ]
-
 let test_mk =
   let make_test ~name ~labels ~header ~contents ~expected =
     let test_name = Printf.sprintf "mk: %S" name in
@@ -70,4 +39,4 @@ let test_mk =
       ~expected:(Error (`Msg "invalid toplevel syntax in toplevel blocks."));
   ]
 
-let suite = ("Block", test_infer_from_file @ test_require_from_line @ test_mk)
+let suite = ("Block", test_infer_from_file @ test_mk)