Changes to solve merge conflicts

hazelgrove · Nov 9, 2024 · 34bede5 · 34bede5
2 parents 89a360e + fa62a34
commit 34bede5
Show file tree

Hide file tree

Showing 33 changed files with 961 additions and 247 deletions.
diff --git a/dune-project b/dune-project
@@ -29,13 +29,12 @@
   reason
   ppx_yojson_conv_lib
   ppx_yojson_conv
-  incr_dom
   (omd (>= 2.0.0~alpha4))
   ezjs_idb
-  virtual_dom
+  bonsai
   ppx_deriving
   ptmap
-  uuidm
+  (uuidm (= 0.9.8)) ; 0.9.9 has breaking deprecated changes
   unionFind
   ocamlformat
   (junit_alcotest :with-test)

diff --git a/dune-workspace b/dune-workspace
@@ -0,0 +1,10 @@
+(lang dune 3.16)
+
+; List of warning codes found at https://ocaml.org/manual/5.2/comp.html#s:comp-options
+(env
+ (dev
+  (flags
+   (:standard -warn-error +A-26-27-K-58))) ; Disable some unused warnings.
+ (release
+  (flags
+   (:standard -warn-error +A-58))))
diff --git a/hazel.opam b/hazel.opam
diff --git a/hazel.opam.locked b/hazel.opam.locked
diff --git a/src/haz3lcore/lang/term/IdTagged.re b/src/haz3lcore/lang/term/IdTagged.re
@@ -14,6 +14,11 @@ type t('a) = {
   term: 'a,
 };
 
+// To be used if you want to remove the id from the debug output
+// let pp: ((Format.formatter, 'a) => unit, Format.formatter, t('a)) => unit =
+//   (fmt_a, formatter, ta) => {
+//     fmt_a(formatter, ta.term);
+//   };
 let fresh = term => {
   {ids: [Id.mk()], copied: false, term};
 };