diff --git a/src/dpool/dune b/src/dpool/dune index 25cc0b1b..23c91d38 100644 --- a/src/dpool/dune +++ b/src/dpool/dune @@ -1,4 +1,3 @@ - (library (name moonpool_dpool) (public_name moonpool.dpool) @@ -7,5 +6,4 @@ (action (run %{project_root}/src/cpp/cpp.exe %{input-file}))) (flags :standard -open Moonpool_private) - (libraries - moonpool.private)) + (libraries moonpool.private)) diff --git a/src/fib/dune b/src/fib/dune index 17a2f48c..17ed239a 100644 --- a/src/fib/dune +++ b/src/fib/dune @@ -1,4 +1,3 @@ - (library (name moonpool_fib) (public_name moonpool.fib) diff --git a/src/forkjoin/dune b/src/forkjoin/dune index 334a6d8b..b17a163d 100644 --- a/src/forkjoin/dune +++ b/src/forkjoin/dune @@ -1,5 +1,3 @@ - - (library (name moonpool_forkjoin) (public_name moonpool.forkjoin) @@ -8,5 +6,4 @@ (optional) (enabled_if (>= %{ocaml_version} 5.0)) - (libraries - moonpool moonpool.private)) + (libraries moonpool moonpool.private)) diff --git a/src/lwt/dune b/src/lwt/dune index f3191c3c..9038747a 100644 --- a/src/lwt/dune +++ b/src/lwt/dune @@ -1,8 +1,7 @@ - (library - (name moonpool_lwt) - (public_name moonpool-lwt) - (private_modules common_) - (enabled_if - (>= %{ocaml_version} 5.0)) - (libraries moonpool moonpool.fib lwt lwt.unix)) + (name moonpool_lwt) + (public_name moonpool-lwt) + (private_modules common_) + (enabled_if + (>= %{ocaml_version} 5.0)) + (libraries moonpool moonpool.fib lwt lwt.unix)) diff --git a/src/private/dla_.real.ml b/src/private/dla_.real.ml index 16901ba2..5f99d714 100644 --- a/src/private/dla_.real.ml +++ b/src/private/dla_.real.ml @@ -7,4 +7,3 @@ let using : prepare_for_await:(unit -> t) -> while_running:(unit -> 'a) -> 'a = Domain_local_await.using let setup_domain () = Domain_local_await.per_thread (module Thread) - diff --git a/test/fiber/dune b/test/fiber/dune index 788766ab..1b6521ad 100644 --- a/test/fiber/dune +++ b/test/fiber/dune @@ -1,7 +1,5 @@ - (tests - (names - t_fib1 t_fls t_main) + (names t_fib1 t_fls t_main) (enabled_if (>= %{ocaml_version} 5.0)) (package moonpool) diff --git a/test/lwt/dune b/test/lwt/dune index 6b243ec0..6ffa3ef2 100644 --- a/test/lwt/dune +++ b/test/lwt/dune @@ -3,29 +3,41 @@ (libraries moonpool moonpool-lwt lwt lwt.unix trace.core trace-tef)) (rule - (targets output_hash.txt) - (deps ./hash_server.exe ./hash_client.exe ./run_hash.sh (glob_files_rec ../data/**)) - (enabled_if (>= %{ocaml_version} 5.0)) - (action - (with-stdout-to %{targets} - (run ./run_hash.sh -d ../data/ --n-conn=2 -j=4)))) + (targets output_hash.txt) + (deps + ./hash_server.exe + ./hash_client.exe + ./run_hash.sh + (glob_files_rec ../data/**)) + (enabled_if + (>= %{ocaml_version} 5.0)) + (action + (with-stdout-to + %{targets} + (run ./run_hash.sh -d ../data/ --n-conn=2 -j=4)))) (rule - (alias runtest) - (enabled_if (>= %{ocaml_version} 5.0)) - (package moonpool-lwt) - (action (diff ./output_hash.expected ./output_hash.txt))) + (alias runtest) + (enabled_if + (>= %{ocaml_version} 5.0)) + (package moonpool-lwt) + (action + (diff ./output_hash.expected ./output_hash.txt))) (rule - (targets output_echo.txt) - (deps ./echo_server.exe ./echo_client.exe ./run_echo.sh) - (enabled_if (>= %{ocaml_version} 5.0)) - (action - (with-stdout-to %{targets} - (run ./run_echo.sh -n 10 --n-conn=2 -j=4)))) + (targets output_echo.txt) + (deps ./echo_server.exe ./echo_client.exe ./run_echo.sh) + (enabled_if + (>= %{ocaml_version} 5.0)) + (action + (with-stdout-to + %{targets} + (run ./run_echo.sh -n 10 --n-conn=2 -j=4)))) (rule - (alias runtest) - (enabled_if (>= %{ocaml_version} 5.0)) - (package moonpool-lwt) - (action (diff ./output_echo.expected ./output_echo.txt))) + (alias runtest) + (enabled_if + (>= %{ocaml_version} 5.0)) + (package moonpool-lwt) + (action + (diff ./output_echo.expected ./output_echo.txt)))