From 45b5e6b1345e639ddc225c841cda6c64aa41c64e Mon Sep 17 00:00:00 2001 From: congyi wang <58715567+wcy-fdu@users.noreply.github.com> Date: Mon, 13 Feb 2023 16:43:28 +0800 Subject: [PATCH] fix: use traversal-excludes to remove OpenDAL in workspace hack (#7853) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .config/hakari.toml | 5 +---- Cargo.lock | 6 ++---- ci/scripts/build.sh | 1 + src/workspace-hack/Cargo.toml | 19 ++++++++----------- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.config/hakari.toml b/.config/hakari.toml index 19abd40be2de1..c089e00aaab26 100644 --- a/.config/hakari.toml +++ b/.config/hakari.toml @@ -24,10 +24,7 @@ platforms = [ # exact-versions = true [traversal-excludes] -workspace-members = ["workspace-config"] - -[final-excludes] -workspace-members = ["risingwave_object_store"] +workspace-members = ["workspace-config", "risingwave_object_store"] third-party = [ { name = "opendal" }, ] \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index a76ffb2022fee..ab383564d1f16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8540,6 +8540,7 @@ dependencies = [ "crossbeam-deque", "crossbeam-epoch", "crossbeam-utils", + "digest", "either", "fail", "fixedbitset", @@ -8568,7 +8569,6 @@ dependencies = [ "log", "madsim-tokio", "memchr", - "mime_guess", "miniz_oxide", "multimap", "num-bigint", @@ -8588,7 +8588,7 @@ dependencies = [ "regex", "regex-syntax", "reqwest", - "rustls", + "ring", "scopeguard", "serde", "smallvec", @@ -8597,9 +8597,7 @@ dependencies = [ "strum", "syn", "time 0.3.17", - "time-macros", "tokio", - "tokio-rustls", "tokio-stream", "tokio-util", "tonic", diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh index b0b777d3580e6..b04ba2aad59c6 100755 --- a/ci/scripts/build.sh +++ b/ci/scripts/build.sh @@ -29,6 +29,7 @@ cargo sort --check --workspace echo "--- Rust cargo-hakari check" cargo hakari generate --diff +cargo hakari verify echo "--- Rust format check" cargo fmt --all -- --check diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 6a9bc960154b1..a116d6c507230 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -35,6 +35,7 @@ crossbeam-channel = { version = "0.5" } crossbeam-deque = { version = "0.8" } crossbeam-epoch = { version = "0.9" } crossbeam-utils = { version = "0.8" } +digest = { version = "0.10", features = ["mac", "std"] } either = { version = "1" } fail = { version = "0.5", default-features = false, features = ["failpoints"] } fixedbitset = { version = "0.4" } @@ -63,7 +64,6 @@ lock_api = { version = "0.4", default-features = false, features = ["arc_lock"] log = { version = "0.4", default-features = false, features = ["kv_unstable", "std"] } madsim-tokio = { version = "0.2", default-features = false, features = ["fs", "io-util", "macros", "net", "process", "rt", "rt-multi-thread", "signal", "sync", "time", "tracing"] } memchr = { version = "2" } -mime_guess = { version = "2" } miniz_oxide = { version = "0.6", default-features = false, features = ["with-alloc"] } multimap = { version = "0.8" } num-bigint = { version = "0.4" } @@ -81,17 +81,16 @@ rand = { version = "0.8", features = ["small_rng"] } rand_core = { version = "0.6", default-features = false, features = ["std"] } regex = { version = "1" } regex-syntax = { version = "0.6" } -reqwest = { version = "0.11", features = ["json", "multipart", "rustls-tls-native-roots", "stream"] } -rustls = { version = "0.20" } +reqwest = { version = "0.11", features = ["json"] } +ring = { version = "0.16", features = ["std"] } scopeguard = { version = "1" } serde = { version = "1", features = ["alloc", "derive", "rc"] } smallvec = { version = "1", default-features = false, features = ["serde"] } socket2 = { version = "0.4", default-features = false, features = ["all"] } stable_deref_trait = { version = "1" } strum = { version = "0.24", features = ["derive"] } -time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing", "serde"] } +time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] } tokio = { version = "1", features = ["fs", "io-std", "io-util", "macros", "net", "parking_lot", "process", "rt-multi-thread", "signal", "stats", "sync", "time", "tracing"] } -tokio-rustls = { version = "0.23" } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7", features = ["codec", "io"] } tonic = { version = "0.8", features = ["gzip", "tls-webpki-roots"] } @@ -128,6 +127,7 @@ crossbeam-channel = { version = "0.5" } crossbeam-deque = { version = "0.8" } crossbeam-epoch = { version = "0.9" } crossbeam-utils = { version = "0.8" } +digest = { version = "0.10", features = ["mac", "std"] } either = { version = "1" } fail = { version = "0.5", default-features = false, features = ["failpoints"] } fixedbitset = { version = "0.4" } @@ -156,7 +156,6 @@ lock_api = { version = "0.4", default-features = false, features = ["arc_lock"] log = { version = "0.4", default-features = false, features = ["kv_unstable", "std"] } madsim-tokio = { version = "0.2", default-features = false, features = ["fs", "io-util", "macros", "net", "process", "rt", "rt-multi-thread", "signal", "sync", "time", "tracing"] } memchr = { version = "2" } -mime_guess = { version = "2" } miniz_oxide = { version = "0.6", default-features = false, features = ["with-alloc"] } multimap = { version = "0.8" } num-bigint = { version = "0.4" } @@ -175,8 +174,8 @@ rand = { version = "0.8", features = ["small_rng"] } rand_core = { version = "0.6", default-features = false, features = ["std"] } regex = { version = "1" } regex-syntax = { version = "0.6" } -reqwest = { version = "0.11", features = ["json", "multipart", "rustls-tls-native-roots", "stream"] } -rustls = { version = "0.20" } +reqwest = { version = "0.11", features = ["json"] } +ring = { version = "0.16", features = ["std"] } scopeguard = { version = "1" } serde = { version = "1", features = ["alloc", "derive", "rc"] } smallvec = { version = "1", default-features = false, features = ["serde"] } @@ -184,10 +183,8 @@ socket2 = { version = "0.4", default-features = false, features = ["all"] } stable_deref_trait = { version = "1" } strum = { version = "0.24", features = ["derive"] } syn = { version = "1", features = ["extra-traits", "full", "visit", "visit-mut"] } -time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing", "serde"] } -time-macros = { version = "0.2", default-features = false, features = ["formatting", "parsing", "serde"] } +time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] } tokio = { version = "1", features = ["fs", "io-std", "io-util", "macros", "net", "parking_lot", "process", "rt-multi-thread", "signal", "stats", "sync", "time", "tracing"] } -tokio-rustls = { version = "0.23" } tokio-stream = { version = "0.1", features = ["net"] } tokio-util = { version = "0.7", features = ["codec", "io"] } tonic = { version = "0.8", features = ["gzip", "tls-webpki-roots"] }