From 3cff7a155cbcb12d98e9cf7239e0bb5c296fc99e Mon Sep 17 00:00:00 2001 From: dr-frmr Date: Mon, 6 Nov 2023 21:01:57 -0500 Subject: [PATCH] remove old symlinks, send_and_await takes timeout --- build.rs | 2 ++ modules/key_value/key_value/src/lib.rs | 3 +-- modules/sqlite/sqlite/src/kernel_types.rs | 1 - modules/sqlite/sqlite/src/lib.rs | 3 +-- modules/sqlite/sqlite/src/process_lib.rs | 1 - modules/sqlite/sqlite_worker/src/kernel_types.rs | 1 - modules/sqlite/sqlite_worker/src/process_lib.rs | 1 - 7 files changed, 4 insertions(+), 8 deletions(-) delete mode 120000 modules/sqlite/sqlite/src/kernel_types.rs delete mode 120000 modules/sqlite/sqlite/src/process_lib.rs delete mode 120000 modules/sqlite/sqlite_worker/src/kernel_types.rs delete mode 120000 modules/sqlite/sqlite_worker/src/process_lib.rs diff --git a/build.rs b/build.rs index c6ec1fa3..949ebb60 100644 --- a/build.rs +++ b/build.rs @@ -157,7 +157,9 @@ fn main() { "app_store", "homepage", "http_proxy", + "key_value", "qns_indexer", + "sqlite", "terminal", ] .contains(&package_name) diff --git a/modules/key_value/key_value/src/lib.rs b/modules/key_value/key_value/src/lib.rs index 70c1dc19..a9486cf0 100644 --- a/modules/key_value/key_value/src/lib.rs +++ b/modules/key_value/key_value/src/lib.rs @@ -101,8 +101,7 @@ fn handle_message(our: &Address, db_to_process: &mut DbToProcess) -> anyhow::Res drive: vfs_drive.clone(), action: kt::VfsAction::New, })?) - .expects_response(15) - .send_and_await_response()??; + .send_and_await_response(15)??; // (2) let vfs_read = wit::get_capability(&vfs_address, &make_vfs_cap("read", &vfs_drive)) diff --git a/modules/sqlite/sqlite/src/kernel_types.rs b/modules/sqlite/sqlite/src/kernel_types.rs deleted file mode 120000 index 047e48bc..00000000 --- a/modules/sqlite/sqlite/src/kernel_types.rs +++ /dev/null @@ -1 +0,0 @@ -../../../../src/kernel_types.rs \ No newline at end of file diff --git a/modules/sqlite/sqlite/src/lib.rs b/modules/sqlite/sqlite/src/lib.rs index bdff8867..d2a19b37 100644 --- a/modules/sqlite/sqlite/src/lib.rs +++ b/modules/sqlite/sqlite/src/lib.rs @@ -103,8 +103,7 @@ fn handle_message ( drive: vfs_drive.clone(), action: kt::VfsAction::New, })?) - .expects_response(15) - .send_and_await_response()??; + .send_and_await_response(15)??; // (2) let vfs_read = wit::get_capability( diff --git a/modules/sqlite/sqlite/src/process_lib.rs b/modules/sqlite/sqlite/src/process_lib.rs deleted file mode 120000 index 9b9ec3f4..00000000 --- a/modules/sqlite/sqlite/src/process_lib.rs +++ /dev/null @@ -1 +0,0 @@ -../../../../src/process_lib.rs \ No newline at end of file diff --git a/modules/sqlite/sqlite_worker/src/kernel_types.rs b/modules/sqlite/sqlite_worker/src/kernel_types.rs deleted file mode 120000 index 047e48bc..00000000 --- a/modules/sqlite/sqlite_worker/src/kernel_types.rs +++ /dev/null @@ -1 +0,0 @@ -../../../../src/kernel_types.rs \ No newline at end of file diff --git a/modules/sqlite/sqlite_worker/src/process_lib.rs b/modules/sqlite/sqlite_worker/src/process_lib.rs deleted file mode 120000 index 9b9ec3f4..00000000 --- a/modules/sqlite/sqlite_worker/src/process_lib.rs +++ /dev/null @@ -1 +0,0 @@ -../../../../src/process_lib.rs \ No newline at end of file