Revert "Use Toploop.add_directive (#4834)"

This reverts commit 3f08057. Signed-off-by: nojebar <[email protected]>
ocaml · Jan 26, 2022 · eb7e8ee · eb7e8ee
1 parent ee27573
commit eb7e8ee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/plugin/jbuild_plugin.ml b/plugin/jbuild_plugin.ml
@@ -1,15 +1,12 @@
 let () =
-  let open Toploop in
-  let add_directive name desc =
-    add_directive name desc { section = ""; doc = "" }
-  in
-  add_directive "require" (Directive_string ignore);
-  add_directive "use"
-    (Directive_string
+  Hashtbl.add Toploop.directive_table "require"
+    (Toploop.Directive_string ignore);
+  Hashtbl.add Toploop.directive_table "use"
+    (Toploop.Directive_string
        (fun _ ->
          failwith "#use is not allowed inside a dune file in OCaml syntax"));
-  add_directive "use_mod"
-    (Directive_string
+  Hashtbl.add Toploop.directive_table "use_mod"
+    (Toploop.Directive_string
        (fun _ ->
          failwith "#use is not allowed inside a dune file in OCaml syntax"))
 

diff --git a/src/dune_rules/assets.ml b/src/dune_rules/assets.ml
@@ -1,16 +1,13 @@
 let jbuild_plugin_ml = {jbp|
 let () =
-  let open Toploop in
-  let add_directive name desc =
-    add_directive name desc { section = ""; doc = "" }
-  in
-  add_directive "require" (Directive_string ignore);
-  add_directive "use"
-    (Directive_string
+  Hashtbl.add Toploop.directive_table "require"
+    (Toploop.Directive_string ignore);
+  Hashtbl.add Toploop.directive_table "use"
+    (Toploop.Directive_string
        (fun _ ->
          failwith "#use is not allowed inside a dune file in OCaml syntax"));
-  add_directive "use_mod"
-    (Directive_string
+  Hashtbl.add Toploop.directive_table "use_mod"
+    (Toploop.Directive_string
        (fun _ ->
          failwith "#use is not allowed inside a dune file in OCaml syntax"))