From 501ec21442febd50cbb35b34bac07bb5afb0457d Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Fri, 30 Jun 2023 13:18:37 -0700 Subject: [PATCH] drop workspace-hack for now it doesn't work well with features and so we were installing things like kafka even if the feature was off --- .config/hakari.toml | 23 ---- Cargo.lock | 109 ---------------- Cargo.toml | 1 - Dockerfile | 7 +- README.md | 9 -- deferred-rate-limiter/Cargo.toml | 1 - entities/Cargo.toml | 1 - latency/Cargo.toml | 1 - migration/Cargo.toml | 1 - payment-contracts/Cargo.toml | 1 - quick_cache_ttl/Cargo.toml | 1 - rate-counter/Cargo.toml | 1 - redis-rate-limiter/Cargo.toml | 1 - web3_proxy/Cargo.toml | 5 +- workspace-hack/.gitattributes | 4 - workspace-hack/Cargo.toml | 211 ------------------------------- workspace-hack/build.rs | 2 - workspace-hack/src/lib.rs | 1 - 18 files changed, 4 insertions(+), 376 deletions(-) delete mode 100644 .config/hakari.toml delete mode 100644 workspace-hack/.gitattributes delete mode 100644 workspace-hack/Cargo.toml delete mode 100644 workspace-hack/build.rs delete mode 100644 workspace-hack/src/lib.rs diff --git a/.config/hakari.toml b/.config/hakari.toml deleted file mode 100644 index 8cd45cdf..00000000 --- a/.config/hakari.toml +++ /dev/null @@ -1,23 +0,0 @@ -# This file contains settings for `cargo hakari`. -# See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options. - -hakari-package = "workspace-hack" - -# Format version for hakari's output. Version 4 requires cargo-hakari 0.9.22 or above. -dep-format-version = "4" - -# Setting workspace.resolver = "2" in the root Cargo.toml is HIGHLY recommended. -# Hakari works much better with the new feature resolver. -# For more about the new feature resolver, see: -# https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver -resolver = "2" - -# Add triples corresponding to platforms commonly used by developers here. -# https://doc.rust-lang.org/rustc/platform-support.html -platforms = [ - "aarch64-unknown-linux-gnu", - "x86_64-unknown-linux-gnu", -] - -# Write out exact versions rather than a semver range. (Defaults to false.) -# exact-versions = true diff --git a/Cargo.lock b/Cargo.lock index 5721beea..3fab0f78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -403,7 +403,6 @@ dependencies = [ "thiserror", "time-core", "tokio", - "uuid 0.8.2", ] [[package]] @@ -1457,7 +1456,6 @@ dependencies = [ "redis-rate-limiter", "tokio", "tracing", - "workspace-hack", ] [[package]] @@ -1687,7 +1685,6 @@ dependencies = [ "serde", "ulid", "uuid 1.4.0", - "workspace-hack", ] [[package]] @@ -3189,7 +3186,6 @@ dependencies = [ "tokio", "tracing", "watermill", - "workspace-hack", ] [[package]] @@ -3362,7 +3358,6 @@ version = "0.32.0" dependencies = [ "sea-orm-migration", "tokio", - "workspace-hack", ] [[package]] @@ -3963,7 +3958,6 @@ version = "0.1.0" dependencies = [ "ethers", "glob", - "workspace-hack", ] [[package]] @@ -4513,7 +4507,6 @@ name = "rate-counter" version = "0.1.0" dependencies = [ "tokio", - "workspace-hack", ] [[package]] @@ -4621,7 +4614,6 @@ dependencies = [ "chrono", "deadpool-redis", "tokio", - "workspace-hack", ] [[package]] @@ -7184,7 +7176,6 @@ dependencies = [ "ulid", "url", "uuid 1.4.0", - "workspace-hack", ] [[package]] @@ -7412,106 +7403,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "workspace-hack" -version = "0.1.0" -dependencies = [ - "Inflector", - "allocator-api2", - "anyhow", - "arrayvec", - "backtrace", - "bitflags 1.3.2", - "byteorder", - "bytes", - "cc", - "chrono", - "clap", - "crossbeam-utils", - "derive_more", - "digest 0.10.7", - "ecdsa", - "either", - "elliptic-curve", - "ethbloom", - "ethers", - "ethers-contract", - "ethers-contract-abigen", - "ethers-etherscan", - "ethers-middleware", - "ethers-providers", - "futures", - "futures-channel", - "futures-core", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", - "generic-array", - "getrandom 0.2.10", - "hashbrown 0.14.0", - "heck 0.4.1", - "hyper", - "indexmap 1.9.3", - "io-lifetimes", - "ipnet", - "k256", - "lazy_static", - "libc", - "lock_api", - "log", - "memchr", - "num-bigint", - "num-integer", - "num-iter", - "num-traits", - "once_cell", - "openssl-sys", - "parking_lot 0.12.1", - "parking_lot_core 0.9.8", - "rand 0.8.5", - "rand_core 0.6.4", - "rdkafka", - "rdkafka-sys", - "regex", - "regex-syntax 0.7.2", - "reqwest", - "rust_decimal", - "rustix", - "sea-orm", - "sea-query", - "sea-query-binder", - "serde", - "serde_json", - "sha1", - "sha2 0.10.7", - "sha3", - "signal-hook", - "spki 0.7.2", - "sqlx", - "sqlx-core", - "sqlx-macros", - "subtle", - "syn 1.0.109", - "syn 2.0.22", - "test-log", - "time 0.3.20", - "time-macros", - "tokio", - "tokio-stream", - "tokio-util", - "tower", - "tracing", - "tracing-core", - "tracing-subscriber", - "ulid", - "unicode-bidi", - "unicode-normalization", - "url", - "uuid 1.4.0", - "zeroize", -] - [[package]] name = "ws_stream_wasm" version = "0.7.4" diff --git a/Cargo.toml b/Cargo.toml index 250f5a43..dc357ffc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,6 @@ members = [ "rate-counter", "redis-rate-limiter", "web3_proxy", - "workspace-hack", ] resolver = "2" diff --git a/Dockerfile b/Dockerfile index 50a6d4ba..f107f0f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,13 +37,12 @@ RUN --mount=type=cache,target=/usr/local/cargo/git \ \ cargo check || [ "$?" -eq 101 ] -# hakari manages a 'workspace-hack' to hopefully build faster # nextest runs tests in parallel # We only pay the installation cost once, it will be cached from the second build onwards RUN --mount=type=cache,target=/usr/local/cargo/git \ --mount=type=cache,target=/usr/local/cargo/registry \ \ - cargo install --locked cargo-hakari cargo-nextest + cargo install --locked cargo-nextest # foundry/anvil are needed to run tests RUN --mount=type=cache,target=/usr/local/cargo/git \ @@ -56,14 +55,12 @@ ENV WEB3_PROXY_FEATURES "rdkafka-src" FROM rust as build_tests -# check hakari and test the application with cargo-nextest +# test the application with cargo-nextest RUN --mount=type=bind,target=.,rw \ --mount=type=cache,target=/usr/local/cargo/git \ --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/app/target,id=build_tests_target \ \ - cargo hakari generate --diff && \ - cargo hakari manage-deps --dry-run && \ RUST_LOG=web3_proxy=trace,info cargo --locked nextest run --features "$WEB3_PROXY_FEATURES" --no-default-features && \ touch /test_success diff --git a/README.md b/README.md index 963db2dd..e51c050e 100644 --- a/README.md +++ b/README.md @@ -47,15 +47,6 @@ Quickly run tests: RUST_LOG=web3_proxy=trace,info cargo nextest run ``` -Keep workspace-hack package up-to-date: - -``` -cargo install cargo-hakari --locked - -cargo hakari generate -cargo hakari verify -``` - ## Common commands Create a user: diff --git a/deferred-rate-limiter/Cargo.toml b/deferred-rate-limiter/Cargo.toml index 4eb5821c..555534a2 100644 --- a/deferred-rate-limiter/Cargo.toml +++ b/deferred-rate-limiter/Cargo.toml @@ -13,4 +13,3 @@ log = "0.4.19" moka = { version = "0.11.2", features = ["future"] } tokio = "1.29.1" tracing = "0.1.37" -workspace-hack = { version = "0.1", path = "../workspace-hack" } diff --git a/entities/Cargo.toml b/entities/Cargo.toml index 85251b9d..0973391b 100644 --- a/entities/Cargo.toml +++ b/entities/Cargo.toml @@ -15,4 +15,3 @@ sea-orm = "0.11.3" serde = "1.0.164" ulid = "1.0.0" uuid = "1.4.0" -workspace-hack = { version = "0.1", path = "../workspace-hack" } diff --git a/latency/Cargo.toml b/latency/Cargo.toml index 8a44097c..ea391447 100644 --- a/latency/Cargo.toml +++ b/latency/Cargo.toml @@ -13,7 +13,6 @@ serde = { version = "1.0.164", features = [] } tokio = { version = "1.29.1", features = ["full"] } tracing = "0.1.37" watermill = "0.1.1" -workspace-hack = { version = "0.1", path = "../workspace-hack" } [dev-dependencies] tokio = { version = "1.29.1", features = ["full", "test-util"] } diff --git a/migration/Cargo.toml b/migration/Cargo.toml index b8577c03..ed1e6145 100644 --- a/migration/Cargo.toml +++ b/migration/Cargo.toml @@ -10,7 +10,6 @@ path = "src/lib.rs" [dependencies] tokio = { version = "1.29.1", features = ["full", "tracing"] } -workspace-hack = { version = "0.1", path = "../workspace-hack" } [dependencies.sea-orm-migration] version = "0.11.3" diff --git a/payment-contracts/Cargo.toml b/payment-contracts/Cargo.toml index a5dd8838..8a27e93c 100644 --- a/payment-contracts/Cargo.toml +++ b/payment-contracts/Cargo.toml @@ -11,4 +11,3 @@ glob = "0.3.1" [dependencies] ethers = { version = "2.0.7", default-features = false } -workspace-hack = { version = "0.1", path = "../workspace-hack" } diff --git a/quick_cache_ttl/Cargo.toml b/quick_cache_ttl/Cargo.toml index fc007c3f..6e0da4f4 100644 --- a/quick_cache_ttl/Cargo.toml +++ b/quick_cache_ttl/Cargo.toml @@ -11,7 +11,6 @@ log = "0.4.18" quick_cache = "0.3.0" serde = "1" tokio = { version = "1.28.2", features = ["full"] } -workspace-hack = { version = "0.1", path = "../workspace-hack" } [dev-dependencies] tokio = { version = "1.28.2", features = ["full", "test-util"] } diff --git a/rate-counter/Cargo.toml b/rate-counter/Cargo.toml index 349c4685..d375b75f 100644 --- a/rate-counter/Cargo.toml +++ b/rate-counter/Cargo.toml @@ -6,4 +6,3 @@ edition = "2021" [dependencies] tokio = { version = "1.29.1", features = ["time"] } -workspace-hack = { version = "0.1", path = "../workspace-hack" } diff --git a/redis-rate-limiter/Cargo.toml b/redis-rate-limiter/Cargo.toml index 6952213d..fe4fd8f8 100644 --- a/redis-rate-limiter/Cargo.toml +++ b/redis-rate-limiter/Cargo.toml @@ -9,4 +9,3 @@ anyhow = "1.0.71" chrono = "0.4.26" deadpool-redis = { version = "0.12.0", features = ["rt_tokio_1", "serde"] } tokio = "1.29.1" -workspace-hack = { version = "0.1", path = "../workspace-hack" } diff --git a/web3_proxy/Cargo.toml b/web3_proxy/Cargo.toml index d7ab286e..90024eeb 100644 --- a/web3_proxy/Cargo.toml +++ b/web3_proxy/Cargo.toml @@ -43,6 +43,7 @@ siwe = { git = "https://github.com/llamanodes/siwe-rs", rev = "013be5204ff1c8577 anyhow = { version = "1.0.71", features = ["backtrace"] } arc-swap = { version = "1.6.0" } argh = "0.1.10" +async-stripe = { version = "0.22.2", default-features = false, features = ["full", "runtime-tokio-hyper-rustls", "webhook-events"] } async-trait = "0.1.68" axum = { version = "0.6.18", features = ["headers", "tracing", "ws"] } axum-client-ip = "0.4.1" @@ -52,6 +53,7 @@ check-if-email-exists = "0.9.0" chrono = { version = "0.4.26" } console-subscriber = { version = "0.1.9", features = ["env-filter", "parking_lot"], optional = true } counter = "0.5.7" +derivative = "2.2.0" derive_more = { version = "0.99.17", features = ["nightly"] } ethbloom = { version = "0.13.0" } ethers = { version = "2.0.7", default-features = false, features = ["rustls", "ws"] } @@ -85,7 +87,6 @@ regex = "1.8.4" reqwest = { version = "0.11.18", default-features = false, features = ["deflate", "gzip", "json", "tokio-rustls"] } rmp-serde = "1.1.1" rust_decimal = { version = "1.30.0", features = ["maths"] } -async-stripe = { version = "0.22.2", features = ["runtime-tokio-hyper-rustls"] } sentry = { version = "0.31.5", default-features = false, features = ["anyhow", "backtrace", "contexts", "panic", "reqwest", "rustls", "serde_json", "tracing"] } sentry-tracing = "0.31.5" serde = { version = "1.0.164" } @@ -106,8 +107,6 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] } ulid = { version = "1.0.0", features = ["rand", "uuid", "serde"] } url = { version = "2.4.0" } uuid = { version = "1.4.0", default-features = false, features = ["fast-rng", "v4", "zerocopy"] } -derivative = "2.2.0" -workspace-hack = { version = "0.1", path = "../workspace-hack" } # TODO: why doesn't this work in dev-dependencies test-log = { version = "0.2.12", default-features = false, features = ["trace"] } diff --git a/workspace-hack/.gitattributes b/workspace-hack/.gitattributes deleted file mode 100644 index 3e9dba4b..00000000 --- a/workspace-hack/.gitattributes +++ /dev/null @@ -1,4 +0,0 @@ -# Avoid putting conflict markers in the generated Cargo.toml file, since their presence breaks -# Cargo. -# Also do not check out the file as CRLF on Windows, as that's what hakari needs. -Cargo.toml merge=binary -crlf diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml deleted file mode 100644 index 75a0255c..00000000 --- a/workspace-hack/Cargo.toml +++ /dev/null @@ -1,211 +0,0 @@ -# This file is generated by `cargo hakari`. -# To regenerate, run: -# cargo hakari generate - -[package] -name = "workspace-hack" -version = "0.1.0" -description = "workspace-hack package, managed by hakari" -# You can choose to publish this crate: see https://docs.rs/cargo-hakari/latest/cargo_hakari/publishing. -publish = false - -# The parts of the file between the BEGIN HAKARI SECTION and END HAKARI SECTION comments -# are managed by hakari. - -### BEGIN HAKARI SECTION -[dependencies] -Inflector = { version = "0.11" } -allocator-api2 = { version = "0.2", default-features = false, features = ["alloc", "nightly"] } -anyhow = { version = "1", features = ["backtrace"] } -arrayvec = { version = "0.7", default-features = false, features = ["std"] } -backtrace = { version = "0.3", features = ["gimli-symbolize"] } -bitflags = { version = "1" } -byteorder = { version = "1" } -bytes = { version = "1", features = ["serde"] } -chrono = { version = "0.4", features = ["serde"] } -clap = { version = "3", features = ["cargo", "derive", "env"] } -crossbeam-utils = { version = "0.8" } -digest = { version = "0.10", features = ["mac", "oid", "std"] } -ecdsa = { version = "0.16", default-features = false, features = ["pkcs8", "signing", "std", "verifying"] } -either = { version = "1" } -elliptic-curve = { version = "0.13", default-features = false, features = ["arithmetic", "digest", "hazmat", "pkcs8", "std"] } -ethbloom = { version = "0.13", features = ["codec"] } -ethers = { version = "2", features = ["ws"] } -ethers-contract = { version = "2", default-features = false, features = ["abigen", "rustls"] } -ethers-contract-abigen = { version = "2", default-features = false, features = ["rustls"] } -ethers-etherscan = { version = "2", default-features = false, features = ["rustls"] } -ethers-middleware = { version = "2", default-features = false, features = ["rustls"] } -ethers-providers = { version = "2", default-features = false, features = ["rustls", "ws"] } -futures = { version = "0.3" } -futures-channel = { version = "0.3", features = ["sink"] } -futures-core = { version = "0.3" } -futures-io = { version = "0.3" } -futures-sink = { version = "0.3" } -futures-task = { version = "0.3" } -futures-util = { version = "0.3", features = ["channel", "io", "sink"] } -generic-array = { version = "0.14", default-features = false, features = ["more_lengths", "zeroize"] } -getrandom = { version = "0.2", default-features = false, features = ["js", "rdrand", "std"] } -hashbrown = { version = "0.14", features = ["nightly", "raw", "serde"] } -indexmap = { version = "1", default-features = false, features = ["std"] } -io-lifetimes = { version = "1" } -k256 = { version = "0.13" } -lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] } -lock_api = { version = "0.4", features = ["arc_lock", "nightly"] } -log = { version = "0.4", default-features = false, features = ["kv_unstable", "std"] } -memchr = { version = "2" } -num-bigint = { version = "0.4" } -num-integer = { version = "0.1", features = ["i128"] } -num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] } -num-traits = { version = "0.2", features = ["i128", "libm"] } -parking_lot = { version = "0.12", features = ["arc_lock", "deadlock_detection", "nightly"] } -parking_lot_core = { version = "0.9", default-features = false, features = ["deadlock_detection", "nightly"] } -rand = { version = "0.8", features = ["serde1", "small_rng"] } -rand_core = { version = "0.6", default-features = false, features = ["serde1", "std"] } -rdkafka = { version = "0.32", features = ["cmake-build", "ssl-vendored", "tracing", "zstd-pkg-config"] } -rdkafka-sys = { version = "4", default-features = false, features = ["cmake-build", "libz", "ssl-vendored", "zstd-pkg-config"] } -regex = { version = "1" } -regex-syntax = { version = "0.7" } -reqwest = { version = "0.11", features = ["blocking", "deflate", "gzip", "json", "native-tls", "rustls-tls", "socks", "stream"] } -rust_decimal = { version = "1", features = ["maths"] } -sea-orm = { version = "0.11", features = ["runtime-tokio-rustls", "sqlx-mysql"] } -sea-query = { version = "0.28", features = ["thread-safe", "with-bigdecimal", "with-chrono", "with-json", "with-rust_decimal", "with-time", "with-uuid"] } -sea-query-binder = { version = "0.3", default-features = false, features = ["runtime-tokio-rustls", "sqlx-mysql", "with-bigdecimal", "with-chrono", "with-json", "with-rust_decimal", "with-time", "with-uuid"] } -serde = { version = "1", features = ["alloc", "derive", "rc"] } -serde_json = { version = "1", features = ["arbitrary_precision", "raw_value", "unbounded_depth"] } -sha1 = { version = "0.10" } -sha2 = { version = "0.10" } -sha3 = { version = "0.10" } -spki = { version = "0.7", default-features = false, features = ["std"] } -sqlx = { version = "0.6", default-features = false, features = ["bigdecimal", "chrono", "decimal", "json", "mysql", "runtime-tokio-rustls", "time", "uuid"] } -sqlx-core = { version = "0.6", default-features = false, features = ["any", "bigdecimal", "chrono", "decimal", "json", "mysql", "runtime-tokio-rustls", "time", "uuid"] } -subtle = { version = "2", default-features = false, features = ["i128"] } -syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "full", "visit", "visit-mut"] } -time = { version = "0.3", features = ["formatting", "macros", "parsing", "serde"] } -tokio = { version = "1", features = ["full", "test-util", "tracing"] } -tokio-stream = { version = "0.1", features = ["fs", "net", "sync"] } -tokio-util = { version = "0.7", features = ["codec", "io"] } -tower = { version = "0.4", features = ["balance", "buffer", "limit", "timeout", "util"] } -tracing = { version = "0.1", features = ["log"] } -tracing-core = { version = "0.1" } -tracing-subscriber = { version = "0.3", features = ["env-filter", "parking_lot"] } -ulid = { version = "1", features = ["serde", "uuid"] } -unicode-bidi = { version = "0.3" } -unicode-normalization = { version = "0.1" } -url = { version = "2", features = ["serde"] } -uuid = { version = "1", features = ["fast-rng", "serde", "v4", "zerocopy"] } -zeroize = { version = "1" } - -[build-dependencies] -Inflector = { version = "0.11" } -allocator-api2 = { version = "0.2", default-features = false, features = ["alloc", "nightly"] } -anyhow = { version = "1", features = ["backtrace"] } -arrayvec = { version = "0.7", default-features = false, features = ["std"] } -backtrace = { version = "0.3", features = ["gimli-symbolize"] } -bitflags = { version = "1" } -byteorder = { version = "1" } -bytes = { version = "1", features = ["serde"] } -cc = { version = "1", default-features = false, features = ["parallel"] } -chrono = { version = "0.4", features = ["serde"] } -crossbeam-utils = { version = "0.8" } -derive_more = { version = "0.99", features = ["nightly"] } -digest = { version = "0.10", features = ["mac", "oid", "std"] } -ecdsa = { version = "0.16", default-features = false, features = ["pkcs8", "signing", "std", "verifying"] } -either = { version = "1" } -elliptic-curve = { version = "0.13", default-features = false, features = ["arithmetic", "digest", "hazmat", "pkcs8", "std"] } -ethbloom = { version = "0.13", features = ["codec"] } -ethers = { version = "2", features = ["ws"] } -ethers-contract = { version = "2", default-features = false, features = ["abigen", "rustls"] } -ethers-contract-abigen = { version = "2", default-features = false, features = ["rustls"] } -ethers-etherscan = { version = "2", default-features = false, features = ["rustls"] } -ethers-middleware = { version = "2", default-features = false, features = ["rustls"] } -ethers-providers = { version = "2", default-features = false, features = ["rustls", "ws"] } -futures-channel = { version = "0.3", features = ["sink"] } -futures-core = { version = "0.3" } -futures-io = { version = "0.3" } -futures-sink = { version = "0.3" } -futures-task = { version = "0.3" } -futures-util = { version = "0.3", features = ["channel", "io", "sink"] } -generic-array = { version = "0.14", default-features = false, features = ["more_lengths", "zeroize"] } -getrandom = { version = "0.2", default-features = false, features = ["js", "rdrand", "std"] } -hashbrown = { version = "0.14", features = ["nightly", "raw", "serde"] } -heck = { version = "0.4", features = ["unicode"] } -indexmap = { version = "1", default-features = false, features = ["std"] } -k256 = { version = "0.13" } -lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] } -lock_api = { version = "0.4", features = ["arc_lock", "nightly"] } -log = { version = "0.4", default-features = false, features = ["kv_unstable", "std"] } -memchr = { version = "2" } -num-bigint = { version = "0.4" } -num-integer = { version = "0.1", features = ["i128"] } -num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] } -num-traits = { version = "0.2", features = ["i128", "libm"] } -parking_lot = { version = "0.12", features = ["arc_lock", "deadlock_detection", "nightly"] } -parking_lot_core = { version = "0.9", default-features = false, features = ["deadlock_detection", "nightly"] } -rand = { version = "0.8", features = ["serde1", "small_rng"] } -rand_core = { version = "0.6", default-features = false, features = ["serde1", "std"] } -regex = { version = "1" } -regex-syntax = { version = "0.7" } -reqwest = { version = "0.11", features = ["blocking", "deflate", "gzip", "json", "native-tls", "rustls-tls", "socks", "stream"] } -rust_decimal = { version = "1", features = ["maths"] } -serde = { version = "1", features = ["alloc", "derive", "rc"] } -serde_json = { version = "1", features = ["arbitrary_precision", "raw_value", "unbounded_depth"] } -sha1 = { version = "0.10" } -sha2 = { version = "0.10" } -sha3 = { version = "0.10" } -spki = { version = "0.7", default-features = false, features = ["std"] } -sqlx-core = { version = "0.6", default-features = false, features = ["any", "bigdecimal", "chrono", "decimal", "json", "mysql", "runtime-tokio-rustls", "time", "uuid"] } -sqlx-macros = { version = "0.6", default-features = false, features = ["bigdecimal", "chrono", "decimal", "json", "mysql", "runtime-tokio-rustls", "time", "uuid"] } -subtle = { version = "2", default-features = false, features = ["i128"] } -syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } -syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "full", "visit", "visit-mut"] } -test-log = { version = "0.2", features = ["trace"] } -time = { version = "0.3", features = ["formatting", "macros", "parsing", "serde"] } -time-macros = { version = "0.2", default-features = false, features = ["formatting", "parsing", "serde"] } -tokio = { version = "1", features = ["full", "test-util", "tracing"] } -tokio-stream = { version = "0.1", features = ["fs", "net", "sync"] } -tokio-util = { version = "0.7", features = ["codec", "io"] } -tracing = { version = "0.1", features = ["log"] } -tracing-core = { version = "0.1" } -unicode-bidi = { version = "0.3" } -unicode-normalization = { version = "0.1" } -url = { version = "2", features = ["serde"] } -uuid = { version = "1", features = ["fast-rng", "serde", "v4", "zerocopy"] } -zeroize = { version = "1" } - -[target.aarch64-unknown-linux-gnu.dependencies] -hyper = { version = "0.14", features = ["full", "nightly"] } -ipnet = { version = "2", features = ["json"] } -libc = { version = "0.2", features = ["extra_traits"] } -once_cell = { version = "1", features = ["unstable"] } -openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] } -rustix = { version = "0.37", features = ["fs", "termios"] } -signal-hook = { version = "0.3" } - -[target.aarch64-unknown-linux-gnu.build-dependencies] -hyper = { version = "0.14", features = ["full", "nightly"] } -io-lifetimes = { version = "1" } -ipnet = { version = "2", features = ["json"] } -libc = { version = "0.2", features = ["extra_traits"] } -once_cell = { version = "1", features = ["unstable"] } -openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] } -rustix = { version = "0.37", features = ["fs", "termios"] } - -[target.x86_64-unknown-linux-gnu.dependencies] -hyper = { version = "0.14", features = ["full", "nightly"] } -ipnet = { version = "2", features = ["json"] } -libc = { version = "0.2", features = ["extra_traits"] } -once_cell = { version = "1", features = ["unstable"] } -openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] } -rustix = { version = "0.37", features = ["fs", "termios"] } -signal-hook = { version = "0.3" } - -[target.x86_64-unknown-linux-gnu.build-dependencies] -hyper = { version = "0.14", features = ["full", "nightly"] } -io-lifetimes = { version = "1" } -ipnet = { version = "2", features = ["json"] } -libc = { version = "0.2", features = ["extra_traits"] } -once_cell = { version = "1", features = ["unstable"] } -openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] } -rustix = { version = "0.37", features = ["fs", "termios"] } - -### END HAKARI SECTION diff --git a/workspace-hack/build.rs b/workspace-hack/build.rs deleted file mode 100644 index 92518ef0..00000000 --- a/workspace-hack/build.rs +++ /dev/null @@ -1,2 +0,0 @@ -// A build script is required for cargo to consider build dependencies. -fn main() {} diff --git a/workspace-hack/src/lib.rs b/workspace-hack/src/lib.rs deleted file mode 100644 index 22489f63..00000000 --- a/workspace-hack/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -// This is a stub lib.rs.