From a33a5e7d70363c0e5d5c95d205d66ae5ad5d7451 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Thu, 7 Nov 2024 12:57:21 +0000 Subject: [PATCH 1/2] Move capnp-rpc to capnp-lwt/proto Also, move the protocol tests under test-lwt. Doing this in two steps to make the diff easier to read. --- Makefile | 2 +- {capnp-rpc => capnp-rpc-lwt/proto}/capTP.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/capTP.mli | 0 {capnp-rpc => capnp-rpc-lwt/proto}/cap_proxy.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/cap_proxy.mli | 0 {capnp-rpc => capnp-rpc-lwt/proto}/capnp_rpc_proto.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/capnp_rpc_proto.mli | 0 {capnp-rpc => capnp-rpc-lwt/proto}/core_types.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/debug.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/debug.mli | 0 {capnp-rpc => capnp-rpc-lwt/proto}/dune | 0 {capnp-rpc => capnp-rpc-lwt/proto}/dyn_array.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/error.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/exception.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/id.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/local_struct_promise.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/local_struct_promise.mli | 0 {capnp-rpc => capnp-rpc-lwt/proto}/message_types.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/rC.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/rC.mli | 0 {capnp-rpc => capnp-rpc-lwt/proto}/rO_array.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/rO_array.mli | 0 {capnp-rpc => capnp-rpc-lwt/proto}/s.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/stats.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/struct_proxy.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/table.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/weak_ptr.ml | 0 {capnp-rpc => capnp-rpc-lwt/proto}/weak_ptr.mli | 0 {test => test-lwt/proto}/dune | 0 {test => test-lwt/proto}/test.ml | 0 {test => test-lwt/proto}/test.mli | 0 {test => test-lwt/proto}/testbed/capnp_direct.ml | 0 {test => test-lwt/proto}/testbed/connection.ml | 0 {test => test-lwt/proto}/testbed/connection.mli | 0 {test => test-lwt/proto}/testbed/dune | 0 {test => test-lwt/proto}/testbed/services.ml | 0 {test => test-lwt/proto}/testbed/test_utils.ml | 0 37 files changed, 1 insertion(+), 1 deletion(-) rename {capnp-rpc => capnp-rpc-lwt/proto}/capTP.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/capTP.mli (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/cap_proxy.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/cap_proxy.mli (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/capnp_rpc_proto.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/capnp_rpc_proto.mli (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/core_types.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/debug.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/debug.mli (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/dune (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/dyn_array.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/error.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/exception.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/id.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/local_struct_promise.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/local_struct_promise.mli (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/message_types.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/rC.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/rC.mli (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/rO_array.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/rO_array.mli (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/s.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/stats.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/struct_proxy.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/table.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/weak_ptr.ml (100%) rename {capnp-rpc => capnp-rpc-lwt/proto}/weak_ptr.mli (100%) rename {test => test-lwt/proto}/dune (100%) rename {test => test-lwt/proto}/test.ml (100%) rename {test => test-lwt/proto}/test.mli (100%) rename {test => test-lwt/proto}/testbed/capnp_direct.ml (100%) rename {test => test-lwt/proto}/testbed/connection.ml (100%) rename {test => test-lwt/proto}/testbed/connection.mli (100%) rename {test => test-lwt/proto}/testbed/dune (100%) rename {test => test-lwt/proto}/testbed/services.ml (100%) rename {test => test-lwt/proto}/testbed/test_utils.ml (100%) diff --git a/Makefile b/Makefile index 1f7fe3eda..4fd02d295 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ clean: test: rm -rf _build/_tests - dune build test/test.exe test-lwt/test_lwt.exe test-bin/calc.exe test-bin/echo/echo_bench.exe @install + dune build test-lwt test-bin @install #./_build/default/test/test.bc test core -ev 36 #./_build/default/test-lwt/test.bc test lwt -ev 3 dune build @runtest --no-buffer -j 1 diff --git a/capnp-rpc/capTP.ml b/capnp-rpc-lwt/proto/capTP.ml similarity index 100% rename from capnp-rpc/capTP.ml rename to capnp-rpc-lwt/proto/capTP.ml diff --git a/capnp-rpc/capTP.mli b/capnp-rpc-lwt/proto/capTP.mli similarity index 100% rename from capnp-rpc/capTP.mli rename to capnp-rpc-lwt/proto/capTP.mli diff --git a/capnp-rpc/cap_proxy.ml b/capnp-rpc-lwt/proto/cap_proxy.ml similarity index 100% rename from capnp-rpc/cap_proxy.ml rename to capnp-rpc-lwt/proto/cap_proxy.ml diff --git a/capnp-rpc/cap_proxy.mli b/capnp-rpc-lwt/proto/cap_proxy.mli similarity index 100% rename from capnp-rpc/cap_proxy.mli rename to capnp-rpc-lwt/proto/cap_proxy.mli diff --git a/capnp-rpc/capnp_rpc_proto.ml b/capnp-rpc-lwt/proto/capnp_rpc_proto.ml similarity index 100% rename from capnp-rpc/capnp_rpc_proto.ml rename to capnp-rpc-lwt/proto/capnp_rpc_proto.ml diff --git a/capnp-rpc/capnp_rpc_proto.mli b/capnp-rpc-lwt/proto/capnp_rpc_proto.mli similarity index 100% rename from capnp-rpc/capnp_rpc_proto.mli rename to capnp-rpc-lwt/proto/capnp_rpc_proto.mli diff --git a/capnp-rpc/core_types.ml b/capnp-rpc-lwt/proto/core_types.ml similarity index 100% rename from capnp-rpc/core_types.ml rename to capnp-rpc-lwt/proto/core_types.ml diff --git a/capnp-rpc/debug.ml b/capnp-rpc-lwt/proto/debug.ml similarity index 100% rename from capnp-rpc/debug.ml rename to capnp-rpc-lwt/proto/debug.ml diff --git a/capnp-rpc/debug.mli b/capnp-rpc-lwt/proto/debug.mli similarity index 100% rename from capnp-rpc/debug.mli rename to capnp-rpc-lwt/proto/debug.mli diff --git a/capnp-rpc/dune b/capnp-rpc-lwt/proto/dune similarity index 100% rename from capnp-rpc/dune rename to capnp-rpc-lwt/proto/dune diff --git a/capnp-rpc/dyn_array.ml b/capnp-rpc-lwt/proto/dyn_array.ml similarity index 100% rename from capnp-rpc/dyn_array.ml rename to capnp-rpc-lwt/proto/dyn_array.ml diff --git a/capnp-rpc/error.ml b/capnp-rpc-lwt/proto/error.ml similarity index 100% rename from capnp-rpc/error.ml rename to capnp-rpc-lwt/proto/error.ml diff --git a/capnp-rpc/exception.ml b/capnp-rpc-lwt/proto/exception.ml similarity index 100% rename from capnp-rpc/exception.ml rename to capnp-rpc-lwt/proto/exception.ml diff --git a/capnp-rpc/id.ml b/capnp-rpc-lwt/proto/id.ml similarity index 100% rename from capnp-rpc/id.ml rename to capnp-rpc-lwt/proto/id.ml diff --git a/capnp-rpc/local_struct_promise.ml b/capnp-rpc-lwt/proto/local_struct_promise.ml similarity index 100% rename from capnp-rpc/local_struct_promise.ml rename to capnp-rpc-lwt/proto/local_struct_promise.ml diff --git a/capnp-rpc/local_struct_promise.mli b/capnp-rpc-lwt/proto/local_struct_promise.mli similarity index 100% rename from capnp-rpc/local_struct_promise.mli rename to capnp-rpc-lwt/proto/local_struct_promise.mli diff --git a/capnp-rpc/message_types.ml b/capnp-rpc-lwt/proto/message_types.ml similarity index 100% rename from capnp-rpc/message_types.ml rename to capnp-rpc-lwt/proto/message_types.ml diff --git a/capnp-rpc/rC.ml b/capnp-rpc-lwt/proto/rC.ml similarity index 100% rename from capnp-rpc/rC.ml rename to capnp-rpc-lwt/proto/rC.ml diff --git a/capnp-rpc/rC.mli b/capnp-rpc-lwt/proto/rC.mli similarity index 100% rename from capnp-rpc/rC.mli rename to capnp-rpc-lwt/proto/rC.mli diff --git a/capnp-rpc/rO_array.ml b/capnp-rpc-lwt/proto/rO_array.ml similarity index 100% rename from capnp-rpc/rO_array.ml rename to capnp-rpc-lwt/proto/rO_array.ml diff --git a/capnp-rpc/rO_array.mli b/capnp-rpc-lwt/proto/rO_array.mli similarity index 100% rename from capnp-rpc/rO_array.mli rename to capnp-rpc-lwt/proto/rO_array.mli diff --git a/capnp-rpc/s.ml b/capnp-rpc-lwt/proto/s.ml similarity index 100% rename from capnp-rpc/s.ml rename to capnp-rpc-lwt/proto/s.ml diff --git a/capnp-rpc/stats.ml b/capnp-rpc-lwt/proto/stats.ml similarity index 100% rename from capnp-rpc/stats.ml rename to capnp-rpc-lwt/proto/stats.ml diff --git a/capnp-rpc/struct_proxy.ml b/capnp-rpc-lwt/proto/struct_proxy.ml similarity index 100% rename from capnp-rpc/struct_proxy.ml rename to capnp-rpc-lwt/proto/struct_proxy.ml diff --git a/capnp-rpc/table.ml b/capnp-rpc-lwt/proto/table.ml similarity index 100% rename from capnp-rpc/table.ml rename to capnp-rpc-lwt/proto/table.ml diff --git a/capnp-rpc/weak_ptr.ml b/capnp-rpc-lwt/proto/weak_ptr.ml similarity index 100% rename from capnp-rpc/weak_ptr.ml rename to capnp-rpc-lwt/proto/weak_ptr.ml diff --git a/capnp-rpc/weak_ptr.mli b/capnp-rpc-lwt/proto/weak_ptr.mli similarity index 100% rename from capnp-rpc/weak_ptr.mli rename to capnp-rpc-lwt/proto/weak_ptr.mli diff --git a/test/dune b/test-lwt/proto/dune similarity index 100% rename from test/dune rename to test-lwt/proto/dune diff --git a/test/test.ml b/test-lwt/proto/test.ml similarity index 100% rename from test/test.ml rename to test-lwt/proto/test.ml diff --git a/test/test.mli b/test-lwt/proto/test.mli similarity index 100% rename from test/test.mli rename to test-lwt/proto/test.mli diff --git a/test/testbed/capnp_direct.ml b/test-lwt/proto/testbed/capnp_direct.ml similarity index 100% rename from test/testbed/capnp_direct.ml rename to test-lwt/proto/testbed/capnp_direct.ml diff --git a/test/testbed/connection.ml b/test-lwt/proto/testbed/connection.ml similarity index 100% rename from test/testbed/connection.ml rename to test-lwt/proto/testbed/connection.ml diff --git a/test/testbed/connection.mli b/test-lwt/proto/testbed/connection.mli similarity index 100% rename from test/testbed/connection.mli rename to test-lwt/proto/testbed/connection.mli diff --git a/test/testbed/dune b/test-lwt/proto/testbed/dune similarity index 100% rename from test/testbed/dune rename to test-lwt/proto/testbed/dune diff --git a/test/testbed/services.ml b/test-lwt/proto/testbed/services.ml similarity index 100% rename from test/testbed/services.ml rename to test-lwt/proto/testbed/services.ml diff --git a/test/testbed/test_utils.ml b/test-lwt/proto/testbed/test_utils.ml similarity index 100% rename from test/testbed/test_utils.ml rename to test-lwt/proto/testbed/test_utils.ml From 5def4159ffe6da046a2f1bb6617ecd0530b84141 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Thu, 7 Nov 2024 12:59:17 +0000 Subject: [PATCH 2/2] Remove lwt from directory names Makes it match the new package names, and also will shrink the diff for the Eio port. --- Makefile | 2 +- {capnp-rpc-lwt => capnp-rpc}/capability.ml | 0 {capnp-rpc-lwt => capnp-rpc}/capnp_core.ml | 0 {capnp-rpc-lwt => capnp-rpc}/capnp_rpc.ml | 0 {capnp-rpc-lwt => capnp-rpc}/capnp_rpc.mli | 0 {capnp-rpc-lwt => capnp-rpc}/dune | 0 {capnp-rpc-lwt => capnp-rpc}/msg.ml | 0 {capnp-rpc-lwt => capnp-rpc}/msg.mli | 0 {capnp-rpc-lwt => capnp-rpc}/persistence.ml | 0 {capnp-rpc-lwt => capnp-rpc}/persistent.capnp | 0 {capnp-rpc-lwt => capnp-rpc}/private.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/capTP.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/capTP.mli | 0 {capnp-rpc-lwt => capnp-rpc}/proto/cap_proxy.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/cap_proxy.mli | 0 {capnp-rpc-lwt => capnp-rpc}/proto/capnp_rpc_proto.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/capnp_rpc_proto.mli | 0 {capnp-rpc-lwt => capnp-rpc}/proto/core_types.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/debug.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/debug.mli | 0 {capnp-rpc-lwt => capnp-rpc}/proto/dune | 0 {capnp-rpc-lwt => capnp-rpc}/proto/dyn_array.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/error.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/exception.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/id.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/local_struct_promise.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/local_struct_promise.mli | 0 {capnp-rpc-lwt => capnp-rpc}/proto/message_types.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/rC.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/rC.mli | 0 {capnp-rpc-lwt => capnp-rpc}/proto/rO_array.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/rO_array.mli | 0 {capnp-rpc-lwt => capnp-rpc}/proto/s.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/stats.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/struct_proxy.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/table.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/weak_ptr.ml | 0 {capnp-rpc-lwt => capnp-rpc}/proto/weak_ptr.mli | 0 {capnp-rpc-lwt => capnp-rpc}/request.ml | 0 {capnp-rpc-lwt => capnp-rpc}/request.mli | 0 {capnp-rpc-lwt => capnp-rpc}/response.ml | 0 {capnp-rpc-lwt => capnp-rpc}/rpc_schema.capnp | 0 {capnp-rpc-lwt => capnp-rpc}/schema.ml | 0 {capnp-rpc-lwt => capnp-rpc}/service.ml | 0 {capnp-rpc-lwt => capnp-rpc}/sturdy_ref.ml | 0 {capnp-rpc-lwt => capnp-rpc}/xform.ml | 0 {capnp-rpc-lwt => capnp-rpc}/xform.mli | 0 {test-lwt => test}/dune | 0 {test-lwt => test}/proto/dune | 0 {test-lwt => test}/proto/test.ml | 0 {test-lwt => test}/proto/test.mli | 0 {test-lwt => test}/proto/testbed/capnp_direct.ml | 0 {test-lwt => test}/proto/testbed/connection.ml | 0 {test-lwt => test}/proto/testbed/connection.mli | 0 {test-lwt => test}/proto/testbed/dune | 0 {test-lwt => test}/proto/testbed/services.ml | 0 {test-lwt => test}/proto/testbed/test_utils.ml | 0 {test-lwt => test}/test_lwt.ml | 0 {test-lwt => test}/test_lwt.mli | 0 59 files changed, 1 insertion(+), 1 deletion(-) rename {capnp-rpc-lwt => capnp-rpc}/capability.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/capnp_core.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/capnp_rpc.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/capnp_rpc.mli (100%) rename {capnp-rpc-lwt => capnp-rpc}/dune (100%) rename {capnp-rpc-lwt => capnp-rpc}/msg.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/msg.mli (100%) rename {capnp-rpc-lwt => capnp-rpc}/persistence.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/persistent.capnp (100%) rename {capnp-rpc-lwt => capnp-rpc}/private.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/capTP.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/capTP.mli (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/cap_proxy.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/cap_proxy.mli (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/capnp_rpc_proto.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/capnp_rpc_proto.mli (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/core_types.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/debug.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/debug.mli (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/dune (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/dyn_array.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/error.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/exception.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/id.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/local_struct_promise.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/local_struct_promise.mli (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/message_types.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/rC.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/rC.mli (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/rO_array.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/rO_array.mli (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/s.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/stats.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/struct_proxy.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/table.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/weak_ptr.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/proto/weak_ptr.mli (100%) rename {capnp-rpc-lwt => capnp-rpc}/request.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/request.mli (100%) rename {capnp-rpc-lwt => capnp-rpc}/response.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/rpc_schema.capnp (100%) rename {capnp-rpc-lwt => capnp-rpc}/schema.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/service.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/sturdy_ref.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/xform.ml (100%) rename {capnp-rpc-lwt => capnp-rpc}/xform.mli (100%) rename {test-lwt => test}/dune (100%) rename {test-lwt => test}/proto/dune (100%) rename {test-lwt => test}/proto/test.ml (100%) rename {test-lwt => test}/proto/test.mli (100%) rename {test-lwt => test}/proto/testbed/capnp_direct.ml (100%) rename {test-lwt => test}/proto/testbed/connection.ml (100%) rename {test-lwt => test}/proto/testbed/connection.mli (100%) rename {test-lwt => test}/proto/testbed/dune (100%) rename {test-lwt => test}/proto/testbed/services.ml (100%) rename {test-lwt => test}/proto/testbed/test_utils.ml (100%) rename {test-lwt => test}/test_lwt.ml (100%) rename {test-lwt => test}/test_lwt.mli (100%) diff --git a/Makefile b/Makefile index 4fd02d295..f8e1976ed 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ clean: test: rm -rf _build/_tests - dune build test-lwt test-bin @install + dune build test test-bin @install #./_build/default/test/test.bc test core -ev 36 #./_build/default/test-lwt/test.bc test lwt -ev 3 dune build @runtest --no-buffer -j 1 diff --git a/capnp-rpc-lwt/capability.ml b/capnp-rpc/capability.ml similarity index 100% rename from capnp-rpc-lwt/capability.ml rename to capnp-rpc/capability.ml diff --git a/capnp-rpc-lwt/capnp_core.ml b/capnp-rpc/capnp_core.ml similarity index 100% rename from capnp-rpc-lwt/capnp_core.ml rename to capnp-rpc/capnp_core.ml diff --git a/capnp-rpc-lwt/capnp_rpc.ml b/capnp-rpc/capnp_rpc.ml similarity index 100% rename from capnp-rpc-lwt/capnp_rpc.ml rename to capnp-rpc/capnp_rpc.ml diff --git a/capnp-rpc-lwt/capnp_rpc.mli b/capnp-rpc/capnp_rpc.mli similarity index 100% rename from capnp-rpc-lwt/capnp_rpc.mli rename to capnp-rpc/capnp_rpc.mli diff --git a/capnp-rpc-lwt/dune b/capnp-rpc/dune similarity index 100% rename from capnp-rpc-lwt/dune rename to capnp-rpc/dune diff --git a/capnp-rpc-lwt/msg.ml b/capnp-rpc/msg.ml similarity index 100% rename from capnp-rpc-lwt/msg.ml rename to capnp-rpc/msg.ml diff --git a/capnp-rpc-lwt/msg.mli b/capnp-rpc/msg.mli similarity index 100% rename from capnp-rpc-lwt/msg.mli rename to capnp-rpc/msg.mli diff --git a/capnp-rpc-lwt/persistence.ml b/capnp-rpc/persistence.ml similarity index 100% rename from capnp-rpc-lwt/persistence.ml rename to capnp-rpc/persistence.ml diff --git a/capnp-rpc-lwt/persistent.capnp b/capnp-rpc/persistent.capnp similarity index 100% rename from capnp-rpc-lwt/persistent.capnp rename to capnp-rpc/persistent.capnp diff --git a/capnp-rpc-lwt/private.ml b/capnp-rpc/private.ml similarity index 100% rename from capnp-rpc-lwt/private.ml rename to capnp-rpc/private.ml diff --git a/capnp-rpc-lwt/proto/capTP.ml b/capnp-rpc/proto/capTP.ml similarity index 100% rename from capnp-rpc-lwt/proto/capTP.ml rename to capnp-rpc/proto/capTP.ml diff --git a/capnp-rpc-lwt/proto/capTP.mli b/capnp-rpc/proto/capTP.mli similarity index 100% rename from capnp-rpc-lwt/proto/capTP.mli rename to capnp-rpc/proto/capTP.mli diff --git a/capnp-rpc-lwt/proto/cap_proxy.ml b/capnp-rpc/proto/cap_proxy.ml similarity index 100% rename from capnp-rpc-lwt/proto/cap_proxy.ml rename to capnp-rpc/proto/cap_proxy.ml diff --git a/capnp-rpc-lwt/proto/cap_proxy.mli b/capnp-rpc/proto/cap_proxy.mli similarity index 100% rename from capnp-rpc-lwt/proto/cap_proxy.mli rename to capnp-rpc/proto/cap_proxy.mli diff --git a/capnp-rpc-lwt/proto/capnp_rpc_proto.ml b/capnp-rpc/proto/capnp_rpc_proto.ml similarity index 100% rename from capnp-rpc-lwt/proto/capnp_rpc_proto.ml rename to capnp-rpc/proto/capnp_rpc_proto.ml diff --git a/capnp-rpc-lwt/proto/capnp_rpc_proto.mli b/capnp-rpc/proto/capnp_rpc_proto.mli similarity index 100% rename from capnp-rpc-lwt/proto/capnp_rpc_proto.mli rename to capnp-rpc/proto/capnp_rpc_proto.mli diff --git a/capnp-rpc-lwt/proto/core_types.ml b/capnp-rpc/proto/core_types.ml similarity index 100% rename from capnp-rpc-lwt/proto/core_types.ml rename to capnp-rpc/proto/core_types.ml diff --git a/capnp-rpc-lwt/proto/debug.ml b/capnp-rpc/proto/debug.ml similarity index 100% rename from capnp-rpc-lwt/proto/debug.ml rename to capnp-rpc/proto/debug.ml diff --git a/capnp-rpc-lwt/proto/debug.mli b/capnp-rpc/proto/debug.mli similarity index 100% rename from capnp-rpc-lwt/proto/debug.mli rename to capnp-rpc/proto/debug.mli diff --git a/capnp-rpc-lwt/proto/dune b/capnp-rpc/proto/dune similarity index 100% rename from capnp-rpc-lwt/proto/dune rename to capnp-rpc/proto/dune diff --git a/capnp-rpc-lwt/proto/dyn_array.ml b/capnp-rpc/proto/dyn_array.ml similarity index 100% rename from capnp-rpc-lwt/proto/dyn_array.ml rename to capnp-rpc/proto/dyn_array.ml diff --git a/capnp-rpc-lwt/proto/error.ml b/capnp-rpc/proto/error.ml similarity index 100% rename from capnp-rpc-lwt/proto/error.ml rename to capnp-rpc/proto/error.ml diff --git a/capnp-rpc-lwt/proto/exception.ml b/capnp-rpc/proto/exception.ml similarity index 100% rename from capnp-rpc-lwt/proto/exception.ml rename to capnp-rpc/proto/exception.ml diff --git a/capnp-rpc-lwt/proto/id.ml b/capnp-rpc/proto/id.ml similarity index 100% rename from capnp-rpc-lwt/proto/id.ml rename to capnp-rpc/proto/id.ml diff --git a/capnp-rpc-lwt/proto/local_struct_promise.ml b/capnp-rpc/proto/local_struct_promise.ml similarity index 100% rename from capnp-rpc-lwt/proto/local_struct_promise.ml rename to capnp-rpc/proto/local_struct_promise.ml diff --git a/capnp-rpc-lwt/proto/local_struct_promise.mli b/capnp-rpc/proto/local_struct_promise.mli similarity index 100% rename from capnp-rpc-lwt/proto/local_struct_promise.mli rename to capnp-rpc/proto/local_struct_promise.mli diff --git a/capnp-rpc-lwt/proto/message_types.ml b/capnp-rpc/proto/message_types.ml similarity index 100% rename from capnp-rpc-lwt/proto/message_types.ml rename to capnp-rpc/proto/message_types.ml diff --git a/capnp-rpc-lwt/proto/rC.ml b/capnp-rpc/proto/rC.ml similarity index 100% rename from capnp-rpc-lwt/proto/rC.ml rename to capnp-rpc/proto/rC.ml diff --git a/capnp-rpc-lwt/proto/rC.mli b/capnp-rpc/proto/rC.mli similarity index 100% rename from capnp-rpc-lwt/proto/rC.mli rename to capnp-rpc/proto/rC.mli diff --git a/capnp-rpc-lwt/proto/rO_array.ml b/capnp-rpc/proto/rO_array.ml similarity index 100% rename from capnp-rpc-lwt/proto/rO_array.ml rename to capnp-rpc/proto/rO_array.ml diff --git a/capnp-rpc-lwt/proto/rO_array.mli b/capnp-rpc/proto/rO_array.mli similarity index 100% rename from capnp-rpc-lwt/proto/rO_array.mli rename to capnp-rpc/proto/rO_array.mli diff --git a/capnp-rpc-lwt/proto/s.ml b/capnp-rpc/proto/s.ml similarity index 100% rename from capnp-rpc-lwt/proto/s.ml rename to capnp-rpc/proto/s.ml diff --git a/capnp-rpc-lwt/proto/stats.ml b/capnp-rpc/proto/stats.ml similarity index 100% rename from capnp-rpc-lwt/proto/stats.ml rename to capnp-rpc/proto/stats.ml diff --git a/capnp-rpc-lwt/proto/struct_proxy.ml b/capnp-rpc/proto/struct_proxy.ml similarity index 100% rename from capnp-rpc-lwt/proto/struct_proxy.ml rename to capnp-rpc/proto/struct_proxy.ml diff --git a/capnp-rpc-lwt/proto/table.ml b/capnp-rpc/proto/table.ml similarity index 100% rename from capnp-rpc-lwt/proto/table.ml rename to capnp-rpc/proto/table.ml diff --git a/capnp-rpc-lwt/proto/weak_ptr.ml b/capnp-rpc/proto/weak_ptr.ml similarity index 100% rename from capnp-rpc-lwt/proto/weak_ptr.ml rename to capnp-rpc/proto/weak_ptr.ml diff --git a/capnp-rpc-lwt/proto/weak_ptr.mli b/capnp-rpc/proto/weak_ptr.mli similarity index 100% rename from capnp-rpc-lwt/proto/weak_ptr.mli rename to capnp-rpc/proto/weak_ptr.mli diff --git a/capnp-rpc-lwt/request.ml b/capnp-rpc/request.ml similarity index 100% rename from capnp-rpc-lwt/request.ml rename to capnp-rpc/request.ml diff --git a/capnp-rpc-lwt/request.mli b/capnp-rpc/request.mli similarity index 100% rename from capnp-rpc-lwt/request.mli rename to capnp-rpc/request.mli diff --git a/capnp-rpc-lwt/response.ml b/capnp-rpc/response.ml similarity index 100% rename from capnp-rpc-lwt/response.ml rename to capnp-rpc/response.ml diff --git a/capnp-rpc-lwt/rpc_schema.capnp b/capnp-rpc/rpc_schema.capnp similarity index 100% rename from capnp-rpc-lwt/rpc_schema.capnp rename to capnp-rpc/rpc_schema.capnp diff --git a/capnp-rpc-lwt/schema.ml b/capnp-rpc/schema.ml similarity index 100% rename from capnp-rpc-lwt/schema.ml rename to capnp-rpc/schema.ml diff --git a/capnp-rpc-lwt/service.ml b/capnp-rpc/service.ml similarity index 100% rename from capnp-rpc-lwt/service.ml rename to capnp-rpc/service.ml diff --git a/capnp-rpc-lwt/sturdy_ref.ml b/capnp-rpc/sturdy_ref.ml similarity index 100% rename from capnp-rpc-lwt/sturdy_ref.ml rename to capnp-rpc/sturdy_ref.ml diff --git a/capnp-rpc-lwt/xform.ml b/capnp-rpc/xform.ml similarity index 100% rename from capnp-rpc-lwt/xform.ml rename to capnp-rpc/xform.ml diff --git a/capnp-rpc-lwt/xform.mli b/capnp-rpc/xform.mli similarity index 100% rename from capnp-rpc-lwt/xform.mli rename to capnp-rpc/xform.mli diff --git a/test-lwt/dune b/test/dune similarity index 100% rename from test-lwt/dune rename to test/dune diff --git a/test-lwt/proto/dune b/test/proto/dune similarity index 100% rename from test-lwt/proto/dune rename to test/proto/dune diff --git a/test-lwt/proto/test.ml b/test/proto/test.ml similarity index 100% rename from test-lwt/proto/test.ml rename to test/proto/test.ml diff --git a/test-lwt/proto/test.mli b/test/proto/test.mli similarity index 100% rename from test-lwt/proto/test.mli rename to test/proto/test.mli diff --git a/test-lwt/proto/testbed/capnp_direct.ml b/test/proto/testbed/capnp_direct.ml similarity index 100% rename from test-lwt/proto/testbed/capnp_direct.ml rename to test/proto/testbed/capnp_direct.ml diff --git a/test-lwt/proto/testbed/connection.ml b/test/proto/testbed/connection.ml similarity index 100% rename from test-lwt/proto/testbed/connection.ml rename to test/proto/testbed/connection.ml diff --git a/test-lwt/proto/testbed/connection.mli b/test/proto/testbed/connection.mli similarity index 100% rename from test-lwt/proto/testbed/connection.mli rename to test/proto/testbed/connection.mli diff --git a/test-lwt/proto/testbed/dune b/test/proto/testbed/dune similarity index 100% rename from test-lwt/proto/testbed/dune rename to test/proto/testbed/dune diff --git a/test-lwt/proto/testbed/services.ml b/test/proto/testbed/services.ml similarity index 100% rename from test-lwt/proto/testbed/services.ml rename to test/proto/testbed/services.ml diff --git a/test-lwt/proto/testbed/test_utils.ml b/test/proto/testbed/test_utils.ml similarity index 100% rename from test-lwt/proto/testbed/test_utils.ml rename to test/proto/testbed/test_utils.ml diff --git a/test-lwt/test_lwt.ml b/test/test_lwt.ml similarity index 100% rename from test-lwt/test_lwt.ml rename to test/test_lwt.ml diff --git a/test-lwt/test_lwt.mli b/test/test_lwt.mli similarity index 100% rename from test-lwt/test_lwt.mli rename to test/test_lwt.mli