From ed53866cdff18251d9b38ca8da333242963d5d93 Mon Sep 17 00:00:00 2001 From: Nikos Gorogiannis Date: Thu, 21 Nov 2024 08:01:23 -0800 Subject: [PATCH] [yojson] open builtins Summary: In upgrading to OCaml 5.2, yojson needs to be upgraded. The target version (0.16) does not open automatically the module with yojson builtins, so the build breaks with errors of the form ``` File "src/IR/Typ.ml", line 125, characters 17-21: 125 | ; is_volatile: bool } ^^^^ Error: Unbound value yojson_of_bool ``` This diff opens the builtins module via dune where needed. Reviewed By: geralt-encore Differential Revision: D66297493 Privacy Context Container: L1208441 fbshipit-source-id: fbf4c54e52a3255ac8d75a6d58e7bd45666ad046 --- infer/src/IR/dune | 4 +++- infer/src/absint/dune | 4 +++- infer/src/backend/dune | 4 +++- infer/src/base/dune | 4 +++- infer/src/checkers/dune | 4 +++- infer/src/pulse/dune | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/infer/src/IR/dune b/infer/src/IR/dune index 1ee3574e21f..5214779439a 100644 --- a/infer/src/IR/dune +++ b/infer/src/IR/dune @@ -17,7 +17,9 @@ -open ATDGenerated -open - IBase)) + IBase + -open + Ppx_yojson_conv_lib.Yojson_conv.Primitives)) (libraries core zarith ppx_show.runtime IStdlib ATDGenerated IBase) (preprocess (pps ppx_compare ppx_hash ppx_show ppx_sexp_conv ppx_yojson_conv inferppx))) diff --git a/infer/src/absint/dune b/infer/src/absint/dune index 88924dab320..3641c9314ad 100644 --- a/infer/src/absint/dune +++ b/infer/src/absint/dune @@ -19,7 +19,9 @@ -open ATDGenerated -open - IBase)) + IBase + -open + Ppx_yojson_conv_lib.Yojson_conv.Primitives)) (libraries core ppx_show.runtime IStdlib ATDGenerated IBase IR) (preprocess (pps ppx_compare ppx_hash ppx_show ppx_yojson_conv))) diff --git a/infer/src/backend/dune b/infer/src/backend/dune index 8483e1c413b..027f36ec95a 100644 --- a/infer/src/backend/dune +++ b/infer/src/backend/dune @@ -41,7 +41,9 @@ -open Concurrency -open - Labs)) + Labs + -open + Ppx_yojson_conv_lib.Yojson_conv.Primitives)) (libraries core memtrace diff --git a/infer/src/base/dune b/infer/src/base/dune index 7ccb4514fbc..8d36f0febe0 100644 --- a/infer/src/base/dune +++ b/infer/src/base/dune @@ -23,7 +23,9 @@ -open ATDGenerated -open - OpenSource)) + OpenSource + -open + Ppx_yojson_conv_lib.Yojson_conv.Primitives)) (libraries cmdliner core diff --git a/infer/src/checkers/dune b/infer/src/checkers/dune index 644a5d84a74..6dd015b3ea8 100644 --- a/infer/src/checkers/dune +++ b/infer/src/checkers/dune @@ -29,7 +29,9 @@ -open BO -open - Pulselib)) + Pulselib + -open + Ppx_yojson_conv_lib.Yojson_conv.Primitives)) (libraries base64 core diff --git a/infer/src/pulse/dune b/infer/src/pulse/dune index 490ccdf6a7e..2d2b0732217 100644 --- a/infer/src/pulse/dune +++ b/infer/src/pulse/dune @@ -27,7 +27,9 @@ -open Absint -open - Topllib)) + Topllib + -open + Ppx_yojson_conv_lib.Yojson_conv.Primitives)) (libraries core iter