From 224a14e6edbc0801c7a3888233d9217335836cee Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Tue, 9 Jan 2024 13:47:19 +0800 Subject: [PATCH 1/4] chore: Remove unused dep async-compat Signed-off-by: Xuanwo --- Cargo.lock | 14 -------------- core/Cargo.toml | 1 - 2 files changed, 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ba191452b03a..0be9fc19a384 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -229,19 +229,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "async-compat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68a707c1feb095d8c07f8a65b9f506b117d30af431cab89374357de7c11461b" -dependencies = [ - "futures-core", - "futures-io", - "once_cell", - "pin-project-lite", - "tokio", -] - [[package]] name = "async-executor" version = "1.7.2" @@ -4540,7 +4527,6 @@ version = "0.44.1" dependencies = [ "anyhow", "async-backtrace", - "async-compat", "async-tls", "async-trait", "atomic_lib", diff --git a/core/Cargo.toml b/core/Cargo.toml index 013447735261..b0fe94d01f0a 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -219,7 +219,6 @@ required-features = ["tests"] [dependencies] anyhow = { version = "1.0.30", features = ["std"] } async-backtrace = { version = "0.2.6", optional = true } -async-compat = "0.2" async-tls = { version = "0.12.0", optional = true } async-trait = "0.1.68" atomic_lib = { version = "0.34.5", optional = true } From 873c26b0c53fec173079d6d622748917d7f1699a Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Tue, 9 Jan 2024 13:50:44 +0800 Subject: [PATCH 2/4] Fix c cargo.lock Signed-off-by: Xuanwo --- bindings/c/Cargo.lock | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/bindings/c/Cargo.lock b/bindings/c/Cargo.lock index f15ebe112106..628b1e95f0c2 100644 --- a/bindings/c/Cargo.lock +++ b/bindings/c/Cargo.lock @@ -38,19 +38,6 @@ version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9" -[[package]] -name = "async-compat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68a707c1feb095d8c07f8a65b9f506b117d30af431cab89374357de7c11461b" -dependencies = [ - "futures-core", - "futures-io", - "once_cell", - "pin-project-lite", - "tokio", -] - [[package]] name = "async-trait" version = "0.1.75" @@ -924,7 +911,6 @@ name = "opendal" version = "0.44.1" dependencies = [ "anyhow", - "async-compat", "async-trait", "backon", "base64", From c6f7f89262d6fcf7be6c459a59e8a6e283d23334 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Tue, 9 Jan 2024 13:56:41 +0800 Subject: [PATCH 3/4] Fix build under wasm32 Signed-off-by: Xuanwo --- core/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/core/Cargo.toml b/core/Cargo.toml index b0fe94d01f0a..a843bffac16c 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -308,6 +308,7 @@ uuid = { version = "1", features = ["serde", "v4"] } [target.'cfg(target_arch = "wasm32")'.dependencies] getrandom = { version = "0.2", features = ["js"] } +tokio = { version = "1.27", features = ["rt"] } [dev-dependencies] criterion = { version = "0.5", features = ["async", "async_tokio"] } From 005e84d72f48927c316cc34a1d704dace5071f33 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Tue, 9 Jan 2024 13:58:13 +0800 Subject: [PATCH 4/4] requires rt Signed-off-by: Xuanwo --- core/Cargo.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/Cargo.toml b/core/Cargo.toml index a843bffac16c..1ca4ca41e453 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -301,14 +301,13 @@ suppaftp = { version = "5.2", default-features = false, features = [ "async-rustls", ], optional = true } tikv-client = { version = "0.3.0", optional = true, default-features = false } -tokio = { version = "1.27", features = ["sync"] } +tokio = { version = "1.27", features = ["sync", "rt"] } tokio-postgres = { version = "0.7.8", optional = true } tracing = { version = "0.1", optional = true } uuid = { version = "1", features = ["serde", "v4"] } [target.'cfg(target_arch = "wasm32")'.dependencies] getrandom = { version = "0.2", features = ["js"] } -tokio = { version = "1.27", features = ["rt"] } [dev-dependencies] criterion = { version = "0.5", features = ["async", "async_tokio"] }