Update lwt dependency (#156)

Author: rvantonder

.dockerignore

@@ -7,3 +7,4 @@
 !comby.opam
 !dune
 !push-coverage-report.sh
+!dune-project

.gitignore

@@ -1,7 +1,6 @@
 .merlin
 _build
 *.install
-/dune-project
 \#*
 .\#*
 scripts/0.*

Dockerfile

@@ -7,6 +7,7 @@ WORKDIR /home/comby
 
 COPY Makefile /home/comby/
 COPY comby.opam /home/comby/
+COPY dune-project /home/comby/
 COPY dune /home/comby/
 COPY docs /home/comby/docs
 COPY src /home/comby/src

comby.opam

@@ -12,7 +12,7 @@ build: [
 depends: [
   "ocaml" {>= "4.08.1"}
   "core" {>= "0.12.2"}
-  "lwt" {>= "4.3.0"}
+  "lwt"
   "mparser-comby"
   "ppxlib"
   "ppx_deriving"
@@ -32,7 +32,6 @@ depends: [
 pin-depends: [
   ["bisect_ppx.git" "git+https://github.com/aantron/bisect_ppx.git"]
   ["mparser-comby.git" "git+https://github.com/comby-tools/mparser.git"]
-  ["lwt.git" "git+https://github.com/rvantonder/lwt.git#4.3.0-with-captain"]
   ["patdiff.git" "git+https://github.com/rvantonder/patdiff.git#0.12.1-patch-compatible-diffs"]
 ]
 depexts: [

dockerfiles/alpine/base-dependencies/Dockerfile

@@ -28,6 +28,6 @@ COPY push-coverage-report.sh /home/comby/
 RUN sudo chown -R $(whoami) /home/comby
 
 # Build and install the OCaml dependencies.
-RUN eval $(opam env) && opam install . --deps-only -y
+RUN eval $(opam env) && opam repository set-url default https://opam.ocaml.org && opam update && opam install . --deps-only -y
 # Delete the source files
 RUN sudo rm -rf /home/comby

dockerfiles/alpine/binary-release/Dockerfile

@@ -7,6 +7,7 @@ WORKDIR /home/comby
 
 COPY Makefile /home/comby/
 COPY comby.opam /home/comby/
+COPY dune-project /home/comby/
 COPY dune /home/comby/
 COPY docs /home/comby/docs
 COPY src /home/comby/src

dune-project

@@ -0,0 +1,2 @@
+(lang dune 1.9)
+(name comby)

lib/pipeline/pipeline.ml

@@ -377,11 +377,6 @@ let run
               count, inputs
             | _ -> failwith "Can't run interactive review for these inputs")
       in
-      (* RVT modified lwt so that the toplevel Lwt scheduler is prevented from
-         starting up at module load. Lwt interferes with hack_parallel child
-         workers otherwise. This command runs the setup function, only after we are
-         finished with parallel work. *)
-      Lwt_unix.i_am_the_captain_now ();
       let { editor; default_is_accept } = Option.value_exn interactive_review in
       Interactive.run editor default_is_accept count rewrites;
       count