Merge branch 'master' into mysql8-redux

links-lang · Nov 14, 2023 · a22b788 · a22b788
2 parents 05afe90 + 5bc1d4f
commit a22b788
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/lens/column.ml b/lens/column.ml
@@ -1,6 +1,11 @@
 open Lens_utility
 module Type = Phrase_type
 
+(* Workaround for issue #1187 (i.e., the @@deriving sexp clause on t
+   below creates code triggering warning 40 otherwise) *)
+open Sexplib0.Sexp_conv_record.Fields
+open Sexplib0.Sexp_conv_record.Kind
+
 type t = {
   table : string;
   name : string;

diff --git a/lens/database.ml b/lens/database.ml
@@ -2,6 +2,11 @@ open Operators
 open Lens_utility
 module LPV = Phrase_value
 
+(* Workaround for issue #1187 (i.e., the @@deriving sexp clause on t
+   below creates code triggering warning 40 otherwise) *)
+open Sexplib0.Sexp_conv_record.Fields
+open Sexplib0.Sexp_conv_record.Kind
+
 type t = {
   serialize : unit -> string;
   driver_name : unit -> string;

diff --git a/lens/sort.ml b/lens/sort.ml
@@ -2,6 +2,11 @@ open Lens_utility
 open Lens_utility.O
 module Column = Column
 
+(* Workaround for issue #1187 (i.e., the @@deriving sexp clause on t
+   below creates code triggering warning 40 otherwise) *)
+open Sexplib0.Sexp_conv_record.Fields
+open Sexplib0.Sexp_conv_record.Kind
+
 type t = {
   fds : Fun_dep.Set.t;
   predicate : Phrase.t option;

diff --git a/lens/value.ml b/lens/value.ml
@@ -1,5 +1,10 @@
 open Lens_utility
 
+(* Workaround for issue #1187 (i.e., the @@deriving sexp clause on t
+   below creates code triggering warning 40 otherwise) *)
+open Sexplib0.Sexp_conv_record.Fields
+open Sexplib0.Sexp_conv_record.Kind
+
 type t =
   | Lens of { table : Database.Table.t; sort : Sort.t }
   | LensMem of { records : Phrase_value.t list; sort : Sort.t }

diff --git a/links.opam b/links.opam
@@ -35,7 +35,7 @@ depends: [
   "result"
   "ocamlfind"
   "menhir" {>= "20210419"}
-  "ppx_sexp_conv" {<= "v0.15.1"}
+  "ppx_sexp_conv" {>= "v0.16.0"}
   "calendar" {>= "2.0.4"}
   "rdf_lwt" {>= "0.13.0"}
 ]