Merge pull request #201 from mt-caret/master

Add open to expose yojson functions used in derives
akabe · Aug 11, 2023 · e8d7fbd · e8d7fbd
2 parents 961bcdc + e36e8d4
commit e8d7fbd
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 0 deletions.
diff --git a/src/completor/merlin.ml b/src/completor/merlin.ml
@@ -27,6 +27,7 @@
 open Format
 open Lwt.Infix
 open Jupyter_log
+open Ppx_yojson_conv_lib.Yojson_conv.Primitives
 
 let string_of_bool b = if b then "y" else "n"
 

diff --git a/src/core/comm.ml b/src/core/comm.ml
@@ -20,6 +20,8 @@
    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    SOFTWARE. *)
 
+open Ppx_yojson_conv_lib.Yojson_conv.Primitives
+
 (** User-defined communication *)
 type t =
   {

diff --git a/src/core/iopub.ml b/src/core/iopub.ml
@@ -20,6 +20,8 @@
    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    SOFTWARE. *)
 
+open Ppx_yojson_conv_lib.Yojson_conv.Primitives
+
 (** Contents on IOPUB channels *)
 
 (** {2 Streams} *)

diff --git a/src/core/message.ml b/src/core/message.ml
@@ -20,6 +20,8 @@
    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    SOFTWARE. *)
 
+open Ppx_yojson_conv_lib.Yojson_conv.Primitives
+
 (** Messaging in Jupyter *)
 
 (** {2 Headers} *)

diff --git a/src/core/shell.ml b/src/core/shell.ml
@@ -20,6 +20,8 @@
    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    SOFTWARE. *)
 
+open Ppx_yojson_conv_lib.Yojson_conv.Primitives
+
 (** Contents on SHELL channels *)
 
 type status =

diff --git a/src/core/stdin.ml b/src/core/stdin.ml
@@ -20,6 +20,8 @@
    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    SOFTWARE. *)
 
+open Ppx_yojson_conv_lib.Yojson_conv.Primitives
+
 (** Contents on STDIN channel *)
 
 (** {2 Inputs} *)

diff --git a/src/kernel/connection_info.ml b/src/kernel/connection_info.ml
@@ -23,6 +23,7 @@
 (** Connection information *)
 
 open Jupyter_log
+open Ppx_yojson_conv_lib.Yojson_conv.Primitives
 
 (** The type of connection information.
 

diff --git a/tests/integration/ppx.ipynb b/tests/integration/ppx.ipynb
@@ -8,6 +8,8 @@
    "source": [
     "#require \"ppx_yojson_conv\" ;;\n",
     "\n",
+    "open Ppx_yojson_conv_lib.Yojson_conv.Primitives\n",
+    "\n",
     "type t = { foo : int; baz : string; } [@@deriving yojson]\n",
     "\n",
     "let expected = \"{\\\"foo\\\":42,\\\"baz\\\":\\\"hello\\\"}\"\n",