Use Toploop.add_directive

CHANGES.md

@@ -177,6 +177,9 @@ Unreleased
   new `(subst <disable|enable>)` stanza to the `dune-project` file.
   (#4864, @kit-ty-kate)
 
+- No longer reference deprecated Toploop functions when using dune files in
+  OCaml syntax. (#4834, fixes #4830, @nojb)
+
 2.9.1 (07/09/2021)
 ------------------
 

plugin/jbuild_plugin.ml

@@ -1,12 +1,15 @@
 let () =
-  Hashtbl.add Toploop.directive_table "require"
-    (Toploop.Directive_string ignore);
-  Hashtbl.add Toploop.directive_table "use"
-    (Toploop.Directive_string
+  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
        (fun _ ->
          failwith "#use is not allowed inside a dune file in OCaml syntax"));
-  Hashtbl.add Toploop.directive_table "use_mod"
-    (Toploop.Directive_string
+  add_directive "use_mod"
+    (Directive_string
        (fun _ ->
          failwith "#use is not allowed inside a dune file in OCaml syntax"))
 

src/dune_rules/assets.ml

@@ -1,13 +1,16 @@
 let jbuild_plugin_ml = {jbp|
 let () =
-  Hashtbl.add Toploop.directive_table "require"
-    (Toploop.Directive_string ignore);
-  Hashtbl.add Toploop.directive_table "use"
-    (Toploop.Directive_string
+  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
        (fun _ ->
          failwith "#use is not allowed inside a dune file in OCaml syntax"));
-  Hashtbl.add Toploop.directive_table "use_mod"
-    (Toploop.Directive_string
+  add_directive "use_mod"
+    (Directive_string
        (fun _ ->
          failwith "#use is not allowed inside a dune file in OCaml syntax"))
 
@@ -73,4 +76,4 @@ module V1 : sig
   (** Execute a command and read its output *)
   val run_and_read_lines : string -> string list
 end
-|jbp}
+|jbp}