From efb4fa23684c1906ff3bfc1908002cb0dadc420f Mon Sep 17 00:00:00 2001
From: Shawn McGinty <loltempast@gmail.com>
Date: Fri, 10 Jan 2020 14:40:35 -0600
Subject: [PATCH 1/2] removing bisect.. its causing problems

---
 naboris.opam |  1 -
 package.json | 14 ++------------
 src/dune     |  1 -
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/naboris.opam b/naboris.opam
index 070db39..56f36aa 100644
--- a/naboris.opam
+++ b/naboris.opam
@@ -21,5 +21,4 @@ depends: [
   "httpaf-lwt-unix" {>= "0.6.0"}
   "lwt" {>= "4.2.1"}
   "uri" {>= "2.2.0"}
-  "bisect_ppx" {dev}
 ]
diff --git a/package.json b/package.json
index 7eb0424..a657d47 100644
--- a/package.json
+++ b/package.json
@@ -6,28 +6,19 @@
     "build": [
       "dune build -p #{self.name}"
     ],
-    "buildInSource": "_build",
-    "buildEnv": {
-      "BISECT_ENABLE": "NO",
-      "BISECT_SILENT": "ERR",
-      "BISECT_FILE": "#{self.target_dir}/bisect"
-    }
+    "buildInSource": "_build"
   },
   "scripts": {
     "source": "rm -f tmp-build-env && esy build-env | grep DUNE_BUILD_DIR > tmp-build-env && source tmp-build-env && rm tmp-build-env",
-    "gen-prod-json": "sed -i '' 's/\"BISECT_ENABLE\": \"YES\"/\"BISECT_ENABLE\": \"NO\"/g' package.json",
-    "gen-test-json": "sed -i '' 's/\"BISECT_ENABLE\": \"NO\"/\"BISECT_ENABLE\": \"YES\"/g' package.json",
     "test": "npm run unit-test",
     "unit-test": "esy b dune runtest",
     "install": "esy install",
     "install-globals": "npm install -g esy",
     "build-docs": "esy b dune build @doc && npm run source && rm -rf docs/html && cp -r $DUNE_BUILD_DIR/default/_doc/_html ./docs/html",
     "build": "esy b dune build @install",
-    "clean": "rm -rf _coverage && find . -name 'bisect*.out' | xargs rm && esy b dune clean",
+    "clean": "esy b dune clean",
     "clean-install": "rm -rf node_modules && rm -rf esy.lock && rm -rf _esy",
     "clean-world": "npm run clean && npm run clean-install",
-    "coco-report-html": "esy bisect-ppx-report -I _build/default/ -html _coverage/ `find . -name 'bisect*.out'`",
-    "coco-report": "esy bisect-ppx-report -I _build/default/ -text -  -summary-only `find . -name 'bisect*.out'`",
     "test-coco": "npm run clean && npm run gen-test-json && npm run test && npm run coco-report && npm run gen-prod-json"
   },
   "repository": {
@@ -47,7 +38,6 @@
     "@opam/httpaf-lwt-unix": ">=0.6.0",
     "@opam/lwt": ">=4.2.1",
     "@opam/uri": ">=2.2.0",
-    "@opam/bisect_ppx": ">=1.4.1"
   },
   "devDependencies": {
     "ocaml": "~4.6.1",
diff --git a/src/dune b/src/dune
index 75c3e57..5d786de 100644
--- a/src/dune
+++ b/src/dune
@@ -1,7 +1,6 @@
 (library
 	(name naboris)
 	(public_name naboris)
-	(preprocess (pps bisect_ppx -conditional))
 	(libraries httpaf httpaf-lwt-unix lwt lwt.unix re uri)
 )
 (include_subdirs unqualified)
\ No newline at end of file

From 5a43482b694ef2afd3a03d196242299177e86d6b Mon Sep 17 00:00:00 2001
From: Shawn McGinty <loltempast@gmail.com>
Date: Fri, 10 Jan 2020 14:45:51 -0600
Subject: [PATCH 2/2] fix invalid json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a657d47..17ff2a6 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "@opam/httpaf": ">=0.6.0",
     "@opam/httpaf-lwt-unix": ">=0.6.0",
     "@opam/lwt": ">=4.2.1",
-    "@opam/uri": ">=2.2.0",
+    "@opam/uri": ">=2.2.0"
   },
   "devDependencies": {
     "ocaml": "~4.6.1",