diff --git a/src/lib_stdlib/jbuild b/src/lib_stdlib/jbuild index 6be6af460..c32e851e0 100644 --- a/src/lib_stdlib/jbuild +++ b/src/lib_stdlib/jbuild @@ -3,7 +3,12 @@ (library ((name tezos_stdlib) (public_name tezos-stdlib) - (libraries (ocplib-endian.bigstring cstruct stringext hex)) + (libraries (ocplib-endian.bigstring + cstruct + stringext + hex + lwt + lwt.log)) (flags (:standard -safe-string)))) (alias diff --git a/src/lib_stdlib_lwt/logging.ml b/src/lib_stdlib/logging.ml similarity index 100% rename from src/lib_stdlib_lwt/logging.ml rename to src/lib_stdlib/logging.ml diff --git a/src/lib_stdlib_lwt/logging.mli b/src/lib_stdlib/logging.mli similarity index 100% rename from src/lib_stdlib_lwt/logging.mli rename to src/lib_stdlib/logging.mli diff --git a/src/lib_stdlib_lwt/lwt_canceler.ml b/src/lib_stdlib/lwt_canceler.ml similarity index 100% rename from src/lib_stdlib_lwt/lwt_canceler.ml rename to src/lib_stdlib/lwt_canceler.ml diff --git a/src/lib_stdlib_lwt/lwt_canceler.mli b/src/lib_stdlib/lwt_canceler.mli similarity index 100% rename from src/lib_stdlib_lwt/lwt_canceler.mli rename to src/lib_stdlib/lwt_canceler.mli diff --git a/src/lib_stdlib_lwt/lwt_dropbox.ml b/src/lib_stdlib/lwt_dropbox.ml similarity index 100% rename from src/lib_stdlib_lwt/lwt_dropbox.ml rename to src/lib_stdlib/lwt_dropbox.ml diff --git a/src/lib_stdlib_lwt/lwt_dropbox.mli b/src/lib_stdlib/lwt_dropbox.mli similarity index 100% rename from src/lib_stdlib_lwt/lwt_dropbox.mli rename to src/lib_stdlib/lwt_dropbox.mli diff --git a/src/lib_stdlib_lwt/lwt_idle_waiter.ml b/src/lib_stdlib/lwt_idle_waiter.ml similarity index 99% rename from src/lib_stdlib_lwt/lwt_idle_waiter.ml rename to src/lib_stdlib/lwt_idle_waiter.ml index 3c7946214..08162fc7e 100644 --- a/src/lib_stdlib_lwt/lwt_idle_waiter.ml +++ b/src/lib_stdlib/lwt_idle_waiter.ml @@ -7,7 +7,7 @@ (* *) (**************************************************************************) -open Error_monad +open Lwt.Infix type t = { mutable pending_tasks : unit Lwt.u list ; diff --git a/src/lib_stdlib_lwt/lwt_idle_waiter.mli b/src/lib_stdlib/lwt_idle_waiter.mli similarity index 100% rename from src/lib_stdlib_lwt/lwt_idle_waiter.mli rename to src/lib_stdlib/lwt_idle_waiter.mli diff --git a/src/lib_stdlib_lwt/lwt_pipe.ml b/src/lib_stdlib/lwt_pipe.ml similarity index 99% rename from src/lib_stdlib_lwt/lwt_pipe.ml rename to src/lib_stdlib/lwt_pipe.ml index cccc91844..402cac7fd 100644 --- a/src/lib_stdlib_lwt/lwt_pipe.ml +++ b/src/lib_stdlib/lwt_pipe.ml @@ -154,7 +154,7 @@ let rec peek ({ closed ; queue ; _ } as q) = wait_push q >>= fun () -> peek q -let peek_all { queue ; closed } = +let peek_all { queue ; closed ; _ } = if closed then [] else diff --git a/src/lib_stdlib_lwt/lwt_pipe.mli b/src/lib_stdlib/lwt_pipe.mli similarity index 100% rename from src/lib_stdlib_lwt/lwt_pipe.mli rename to src/lib_stdlib/lwt_pipe.mli diff --git a/src/lib_stdlib_lwt/lwt_utils.ml b/src/lib_stdlib/lwt_utils.ml similarity index 100% rename from src/lib_stdlib_lwt/lwt_utils.ml rename to src/lib_stdlib/lwt_utils.ml diff --git a/src/lib_stdlib_lwt/lwt_utils.mli b/src/lib_stdlib/lwt_utils.mli similarity index 100% rename from src/lib_stdlib_lwt/lwt_utils.mli rename to src/lib_stdlib/lwt_utils.mli diff --git a/src/lib_stdlib_lwt/lwt_watcher.ml b/src/lib_stdlib/lwt_watcher.ml similarity index 100% rename from src/lib_stdlib_lwt/lwt_watcher.ml rename to src/lib_stdlib/lwt_watcher.ml diff --git a/src/lib_stdlib_lwt/lwt_watcher.mli b/src/lib_stdlib/lwt_watcher.mli similarity index 100% rename from src/lib_stdlib_lwt/lwt_watcher.mli rename to src/lib_stdlib/lwt_watcher.mli diff --git a/src/lib_stdlib/test/jbuild b/src/lib_stdlib/test/jbuild index 717944c00..3c1b0e7f3 100644 --- a/src/lib_stdlib/test/jbuild +++ b/src/lib_stdlib/test/jbuild @@ -2,8 +2,10 @@ (executables ((names (test_tzList - test_mbytes_buffer)) - (libraries (tezos-stdlib tezos-test-helpers)) + test_mbytes_buffer + test_lwt_pipe)) + (libraries (tezos-stdlib + tezos-test-helpers)) (flags (:standard -w -9-32 -safe-string -open Tezos_test_helpers @@ -12,7 +14,8 @@ (alias ((name buildtest) (deps (test_tzList.exe - test_mbytes_buffer.exe)))) + test_mbytes_buffer.exe + test_lwt_pipe.exe)))) (alias ((name runtest_tzList) @@ -22,10 +25,15 @@ ((name runtest_mbytes_buffer) (action (run ${exe:test_mbytes_buffer.exe})))) +(alias + ((name runtest_lwt_pipe) + (action (run ${exe:test_lwt_pipe.exe})))) + (alias ((name runtest) (deps ((alias runtest_tzList) - (alias runtest_mbytes_buffer))))) + (alias runtest_mbytes_buffer) + (alias runtest_lwt_pipe))))) (alias ((name runtest_indent) diff --git a/src/lib_stdlib_lwt/test/test_lwt_pipe.ml b/src/lib_stdlib/test/test_lwt_pipe.ml similarity index 100% rename from src/lib_stdlib_lwt/test/test_lwt_pipe.ml rename to src/lib_stdlib/test/test_lwt_pipe.ml diff --git a/src/lib_stdlib/tezos-stdlib.opam b/src/lib_stdlib/tezos-stdlib.opam index bbc66a167..8904620b7 100644 --- a/src/lib_stdlib/tezos-stdlib.opam +++ b/src/lib_stdlib/tezos-stdlib.opam @@ -14,6 +14,7 @@ depends: [ "hex" "ocplib-endian" "stringext" + "lwt" ] build: [ [ "jbuilder" "build" "-p" name "-j" jobs ] diff --git a/src/lib_stdlib_lwt/test/jbuild b/src/lib_stdlib_lwt/test/jbuild deleted file mode 100644 index 059f027c5..000000000 --- a/src/lib_stdlib_lwt/test/jbuild +++ /dev/null @@ -1,27 +0,0 @@ -(jbuild_version 1) - -(executables - ((names (test_lwt_pipe)) - (libraries (tezos-stdlib-lwt tezos-test-helpers)) - (flags (:standard -w -9-32 - -safe-string - -open Tezos_test_helpers - -open Tezos_stdlib_lwt)))) - -(alias - ((name buildtest) - (deps (test_lwt_pipe.exe)))) - -(alias - ((name runtest_lwt_pipe) - (action (run ${exe:test_lwt_pipe.exe})))) - - -(alias - ((name runtest) - (deps ((alias runtest_lwt_pipe))))) - -(alias - ((name runtest_indent) - (deps ((glob_files *.ml*))) - (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))