From c8bd7ccc81e517b4c4f3753967447b18cfc5ff74 Mon Sep 17 00:00:00 2001 From: duzhaoteng <997607625@qq.com> Date: Mon, 10 Jul 2023 15:50:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=93=E5=89=8D=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE=E5=8F=8Atoml=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.toml | 18 +++++++----------- .../cloud_extension}/Cargo.toml | 0 .../cloud_extension}/README.md | 0 .../cloud_extension}/README_zh.md | 0 .../cloud_extension}/include/cloud_extension.h | 0 .../cloud_extension}/src/c_adapter/mod.rs | 0 .../cloud_extension}/src/ipc_conn/error.rs | 0 .../cloud_extension}/src/ipc_conn/mod.rs | 0 .../cloud_extension}/src/ipc_conn/types.rs | 0 .../cloud_extension}/src/lib.rs | 0 .../src/service_impl/asset_loader.rs | 0 .../src/service_impl/cloud_db.rs | 0 .../src/service_impl/cloud_service.rs | 0 .../cloud_extension}/src/service_impl/error.rs | 0 .../cloud_extension}/src/service_impl/mod.rs | 0 {hilog_rust => src/hilog_rust}/Cargo.toml | 0 {hilog_rust => src/hilog_rust}/src/lib.rs | 0 {hilog_rust => src/hilog_rust}/src/macros.rs | 0 {ipc_rust => src/ipc_rust}/Cargo.toml | 2 +- {ipc_rust => src/ipc_rust}/src/ashmem.rs | 0 {ipc_rust => src/ipc_rust}/src/errors.rs | 0 {ipc_rust => src/ipc_rust}/src/ipc/macros.rs | 0 {ipc_rust => src/ipc_rust}/src/ipc/mod.rs | 0 .../ipc_rust}/src/ipc/remote_obj.rs | 0 .../ipc_rust}/src/ipc/remote_obj/cmp.rs | 0 .../src/ipc/remote_obj/death_recipient.rs | 0 .../ipc_rust}/src/ipc/remote_stub.rs | 0 {ipc_rust => src/ipc_rust}/src/ipc_binding.rs | 0 {ipc_rust => src/ipc_rust}/src/lib.rs | 0 {ipc_rust => src/ipc_rust}/src/parcel/mod.rs | 0 .../ipc_rust}/src/parcel/parcelable.rs | 0 {ipc_rust => src/ipc_rust}/src/parcel/types.rs | 0 .../ipc_rust}/src/parcel/types/bool.rs | 0 .../ipc_rust}/src/parcel/types/boxt.rs | 0 .../ipc_rust}/src/parcel/types/const_array.rs | 0 .../ipc_rust}/src/parcel/types/file_desc.rs | 0 .../ipc_rust}/src/parcel/types/integer.rs | 0 .../src/parcel/types/interface_token.rs | 0 .../ipc_rust}/src/parcel/types/option.rs | 0 .../ipc_rust}/src/parcel/types/reference.rs | 0 .../ipc_rust}/src/parcel/types/slices.rs | 0 .../ipc_rust}/src/parcel/types/string16.rs | 0 .../ipc_rust}/src/parcel/types/strings.rs | 0 .../ipc_rust}/src/parcel/types/vector.rs | 0 {ipc_rust => src/ipc_rust}/src/process.rs | 0 45 files changed, 8 insertions(+), 12 deletions(-) rename {cloud_extension => src/cloud_extension}/Cargo.toml (100%) rename {cloud_extension => src/cloud_extension}/README.md (100%) rename {cloud_extension => src/cloud_extension}/README_zh.md (100%) rename {cloud_extension => src/cloud_extension}/include/cloud_extension.h (100%) rename {cloud_extension => src/cloud_extension}/src/c_adapter/mod.rs (100%) rename {cloud_extension => src/cloud_extension}/src/ipc_conn/error.rs (100%) rename {cloud_extension => src/cloud_extension}/src/ipc_conn/mod.rs (100%) rename {cloud_extension => src/cloud_extension}/src/ipc_conn/types.rs (100%) rename {cloud_extension => src/cloud_extension}/src/lib.rs (100%) rename {cloud_extension => src/cloud_extension}/src/service_impl/asset_loader.rs (100%) rename {cloud_extension => src/cloud_extension}/src/service_impl/cloud_db.rs (100%) rename {cloud_extension => src/cloud_extension}/src/service_impl/cloud_service.rs (100%) rename {cloud_extension => src/cloud_extension}/src/service_impl/error.rs (100%) rename {cloud_extension => src/cloud_extension}/src/service_impl/mod.rs (100%) rename {hilog_rust => src/hilog_rust}/Cargo.toml (100%) rename {hilog_rust => src/hilog_rust}/src/lib.rs (100%) rename {hilog_rust => src/hilog_rust}/src/macros.rs (100%) rename {ipc_rust => src/ipc_rust}/Cargo.toml (81%) rename {ipc_rust => src/ipc_rust}/src/ashmem.rs (100%) rename {ipc_rust => src/ipc_rust}/src/errors.rs (100%) rename {ipc_rust => src/ipc_rust}/src/ipc/macros.rs (100%) rename {ipc_rust => src/ipc_rust}/src/ipc/mod.rs (100%) rename {ipc_rust => src/ipc_rust}/src/ipc/remote_obj.rs (100%) rename {ipc_rust => src/ipc_rust}/src/ipc/remote_obj/cmp.rs (100%) rename {ipc_rust => src/ipc_rust}/src/ipc/remote_obj/death_recipient.rs (100%) rename {ipc_rust => src/ipc_rust}/src/ipc/remote_stub.rs (100%) rename {ipc_rust => src/ipc_rust}/src/ipc_binding.rs (100%) rename {ipc_rust => src/ipc_rust}/src/lib.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/mod.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/parcelable.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types/bool.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types/boxt.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types/const_array.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types/file_desc.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types/integer.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types/interface_token.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types/option.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types/reference.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types/slices.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types/string16.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types/strings.rs (100%) rename {ipc_rust => src/ipc_rust}/src/parcel/types/vector.rs (100%) rename {ipc_rust => src/ipc_rust}/src/process.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 1fa4514..b8d9bc7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,7 @@ -[package] -name = "rust_proj_mock" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -cloudExtension = { path = "./cloudExtension"} -ipc_rust = { path = "./ipc_rust"} -hilog_rust = { path = "./hilog_rust"} \ No newline at end of file +[workspace] +resolver = "2" +members = [ + "src/cloud_extension", + "src/ipc_rust", + "src/hilog_rust" +] \ No newline at end of file diff --git a/cloud_extension/Cargo.toml b/src/cloud_extension/Cargo.toml similarity index 100% rename from cloud_extension/Cargo.toml rename to src/cloud_extension/Cargo.toml diff --git a/cloud_extension/README.md b/src/cloud_extension/README.md similarity index 100% rename from cloud_extension/README.md rename to src/cloud_extension/README.md diff --git a/cloud_extension/README_zh.md b/src/cloud_extension/README_zh.md similarity index 100% rename from cloud_extension/README_zh.md rename to src/cloud_extension/README_zh.md diff --git a/cloud_extension/include/cloud_extension.h b/src/cloud_extension/include/cloud_extension.h similarity index 100% rename from cloud_extension/include/cloud_extension.h rename to src/cloud_extension/include/cloud_extension.h diff --git a/cloud_extension/src/c_adapter/mod.rs b/src/cloud_extension/src/c_adapter/mod.rs similarity index 100% rename from cloud_extension/src/c_adapter/mod.rs rename to src/cloud_extension/src/c_adapter/mod.rs diff --git a/cloud_extension/src/ipc_conn/error.rs b/src/cloud_extension/src/ipc_conn/error.rs similarity index 100% rename from cloud_extension/src/ipc_conn/error.rs rename to src/cloud_extension/src/ipc_conn/error.rs diff --git a/cloud_extension/src/ipc_conn/mod.rs b/src/cloud_extension/src/ipc_conn/mod.rs similarity index 100% rename from cloud_extension/src/ipc_conn/mod.rs rename to src/cloud_extension/src/ipc_conn/mod.rs diff --git a/cloud_extension/src/ipc_conn/types.rs b/src/cloud_extension/src/ipc_conn/types.rs similarity index 100% rename from cloud_extension/src/ipc_conn/types.rs rename to src/cloud_extension/src/ipc_conn/types.rs diff --git a/cloud_extension/src/lib.rs b/src/cloud_extension/src/lib.rs similarity index 100% rename from cloud_extension/src/lib.rs rename to src/cloud_extension/src/lib.rs diff --git a/cloud_extension/src/service_impl/asset_loader.rs b/src/cloud_extension/src/service_impl/asset_loader.rs similarity index 100% rename from cloud_extension/src/service_impl/asset_loader.rs rename to src/cloud_extension/src/service_impl/asset_loader.rs diff --git a/cloud_extension/src/service_impl/cloud_db.rs b/src/cloud_extension/src/service_impl/cloud_db.rs similarity index 100% rename from cloud_extension/src/service_impl/cloud_db.rs rename to src/cloud_extension/src/service_impl/cloud_db.rs diff --git a/cloud_extension/src/service_impl/cloud_service.rs b/src/cloud_extension/src/service_impl/cloud_service.rs similarity index 100% rename from cloud_extension/src/service_impl/cloud_service.rs rename to src/cloud_extension/src/service_impl/cloud_service.rs diff --git a/cloud_extension/src/service_impl/error.rs b/src/cloud_extension/src/service_impl/error.rs similarity index 100% rename from cloud_extension/src/service_impl/error.rs rename to src/cloud_extension/src/service_impl/error.rs diff --git a/cloud_extension/src/service_impl/mod.rs b/src/cloud_extension/src/service_impl/mod.rs similarity index 100% rename from cloud_extension/src/service_impl/mod.rs rename to src/cloud_extension/src/service_impl/mod.rs diff --git a/hilog_rust/Cargo.toml b/src/hilog_rust/Cargo.toml similarity index 100% rename from hilog_rust/Cargo.toml rename to src/hilog_rust/Cargo.toml diff --git a/hilog_rust/src/lib.rs b/src/hilog_rust/src/lib.rs similarity index 100% rename from hilog_rust/src/lib.rs rename to src/hilog_rust/src/lib.rs diff --git a/hilog_rust/src/macros.rs b/src/hilog_rust/src/macros.rs similarity index 100% rename from hilog_rust/src/macros.rs rename to src/hilog_rust/src/macros.rs diff --git a/ipc_rust/Cargo.toml b/src/ipc_rust/Cargo.toml similarity index 81% rename from ipc_rust/Cargo.toml rename to src/ipc_rust/Cargo.toml index ae18d6d..71f9d3d 100644 --- a/ipc_rust/Cargo.toml +++ b/src/ipc_rust/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -hilog_rust = { path = "../hilog_rust"} \ No newline at end of file +hilog_rust = { path = "../hilog_rust" } \ No newline at end of file diff --git a/ipc_rust/src/ashmem.rs b/src/ipc_rust/src/ashmem.rs similarity index 100% rename from ipc_rust/src/ashmem.rs rename to src/ipc_rust/src/ashmem.rs diff --git a/ipc_rust/src/errors.rs b/src/ipc_rust/src/errors.rs similarity index 100% rename from ipc_rust/src/errors.rs rename to src/ipc_rust/src/errors.rs diff --git a/ipc_rust/src/ipc/macros.rs b/src/ipc_rust/src/ipc/macros.rs similarity index 100% rename from ipc_rust/src/ipc/macros.rs rename to src/ipc_rust/src/ipc/macros.rs diff --git a/ipc_rust/src/ipc/mod.rs b/src/ipc_rust/src/ipc/mod.rs similarity index 100% rename from ipc_rust/src/ipc/mod.rs rename to src/ipc_rust/src/ipc/mod.rs diff --git a/ipc_rust/src/ipc/remote_obj.rs b/src/ipc_rust/src/ipc/remote_obj.rs similarity index 100% rename from ipc_rust/src/ipc/remote_obj.rs rename to src/ipc_rust/src/ipc/remote_obj.rs diff --git a/ipc_rust/src/ipc/remote_obj/cmp.rs b/src/ipc_rust/src/ipc/remote_obj/cmp.rs similarity index 100% rename from ipc_rust/src/ipc/remote_obj/cmp.rs rename to src/ipc_rust/src/ipc/remote_obj/cmp.rs diff --git a/ipc_rust/src/ipc/remote_obj/death_recipient.rs b/src/ipc_rust/src/ipc/remote_obj/death_recipient.rs similarity index 100% rename from ipc_rust/src/ipc/remote_obj/death_recipient.rs rename to src/ipc_rust/src/ipc/remote_obj/death_recipient.rs diff --git a/ipc_rust/src/ipc/remote_stub.rs b/src/ipc_rust/src/ipc/remote_stub.rs similarity index 100% rename from ipc_rust/src/ipc/remote_stub.rs rename to src/ipc_rust/src/ipc/remote_stub.rs diff --git a/ipc_rust/src/ipc_binding.rs b/src/ipc_rust/src/ipc_binding.rs similarity index 100% rename from ipc_rust/src/ipc_binding.rs rename to src/ipc_rust/src/ipc_binding.rs diff --git a/ipc_rust/src/lib.rs b/src/ipc_rust/src/lib.rs similarity index 100% rename from ipc_rust/src/lib.rs rename to src/ipc_rust/src/lib.rs diff --git a/ipc_rust/src/parcel/mod.rs b/src/ipc_rust/src/parcel/mod.rs similarity index 100% rename from ipc_rust/src/parcel/mod.rs rename to src/ipc_rust/src/parcel/mod.rs diff --git a/ipc_rust/src/parcel/parcelable.rs b/src/ipc_rust/src/parcel/parcelable.rs similarity index 100% rename from ipc_rust/src/parcel/parcelable.rs rename to src/ipc_rust/src/parcel/parcelable.rs diff --git a/ipc_rust/src/parcel/types.rs b/src/ipc_rust/src/parcel/types.rs similarity index 100% rename from ipc_rust/src/parcel/types.rs rename to src/ipc_rust/src/parcel/types.rs diff --git a/ipc_rust/src/parcel/types/bool.rs b/src/ipc_rust/src/parcel/types/bool.rs similarity index 100% rename from ipc_rust/src/parcel/types/bool.rs rename to src/ipc_rust/src/parcel/types/bool.rs diff --git a/ipc_rust/src/parcel/types/boxt.rs b/src/ipc_rust/src/parcel/types/boxt.rs similarity index 100% rename from ipc_rust/src/parcel/types/boxt.rs rename to src/ipc_rust/src/parcel/types/boxt.rs diff --git a/ipc_rust/src/parcel/types/const_array.rs b/src/ipc_rust/src/parcel/types/const_array.rs similarity index 100% rename from ipc_rust/src/parcel/types/const_array.rs rename to src/ipc_rust/src/parcel/types/const_array.rs diff --git a/ipc_rust/src/parcel/types/file_desc.rs b/src/ipc_rust/src/parcel/types/file_desc.rs similarity index 100% rename from ipc_rust/src/parcel/types/file_desc.rs rename to src/ipc_rust/src/parcel/types/file_desc.rs diff --git a/ipc_rust/src/parcel/types/integer.rs b/src/ipc_rust/src/parcel/types/integer.rs similarity index 100% rename from ipc_rust/src/parcel/types/integer.rs rename to src/ipc_rust/src/parcel/types/integer.rs diff --git a/ipc_rust/src/parcel/types/interface_token.rs b/src/ipc_rust/src/parcel/types/interface_token.rs similarity index 100% rename from ipc_rust/src/parcel/types/interface_token.rs rename to src/ipc_rust/src/parcel/types/interface_token.rs diff --git a/ipc_rust/src/parcel/types/option.rs b/src/ipc_rust/src/parcel/types/option.rs similarity index 100% rename from ipc_rust/src/parcel/types/option.rs rename to src/ipc_rust/src/parcel/types/option.rs diff --git a/ipc_rust/src/parcel/types/reference.rs b/src/ipc_rust/src/parcel/types/reference.rs similarity index 100% rename from ipc_rust/src/parcel/types/reference.rs rename to src/ipc_rust/src/parcel/types/reference.rs diff --git a/ipc_rust/src/parcel/types/slices.rs b/src/ipc_rust/src/parcel/types/slices.rs similarity index 100% rename from ipc_rust/src/parcel/types/slices.rs rename to src/ipc_rust/src/parcel/types/slices.rs diff --git a/ipc_rust/src/parcel/types/string16.rs b/src/ipc_rust/src/parcel/types/string16.rs similarity index 100% rename from ipc_rust/src/parcel/types/string16.rs rename to src/ipc_rust/src/parcel/types/string16.rs diff --git a/ipc_rust/src/parcel/types/strings.rs b/src/ipc_rust/src/parcel/types/strings.rs similarity index 100% rename from ipc_rust/src/parcel/types/strings.rs rename to src/ipc_rust/src/parcel/types/strings.rs diff --git a/ipc_rust/src/parcel/types/vector.rs b/src/ipc_rust/src/parcel/types/vector.rs similarity index 100% rename from ipc_rust/src/parcel/types/vector.rs rename to src/ipc_rust/src/parcel/types/vector.rs diff --git a/ipc_rust/src/process.rs b/src/ipc_rust/src/process.rs similarity index 100% rename from ipc_rust/src/process.rs rename to src/ipc_rust/src/process.rs -- Gitee