diff --git a/.config/hakari.toml b/.config/hakari.toml new file mode 100644 index 000000000000..aa6b175fd08a --- /dev/null +++ b/.config/hakari.toml @@ -0,0 +1,8 @@ +hakari-package = "workspace-hack" +dep-format-version = "2" +resolver = "2" +platforms = [ + "x86_64-unknown-linux-gnu", + "x86_64-apple-darwin", +] +exact-versions = true diff --git a/Cargo.lock b/Cargo.lock index a70219d1bdf9..411a9733fefb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3285,6 +3285,7 @@ dependencies = [ "toml", "url", "uuid", + "workspace-hack", ] [[package]] @@ -3350,6 +3351,7 @@ dependencies = [ "tracing-subscriber", "uncased", "uuid", + "workspace-hack", ] [[package]] @@ -3361,6 +3363,7 @@ dependencies = [ "serde", "serde_json", "serde_plain", + "workspace-hack", ] [[package]] @@ -3384,6 +3387,7 @@ dependencies = [ "snap", "tracing", "uuid", + "workspace-hack", ] [[package]] @@ -3392,6 +3396,7 @@ version = "0.0.0" dependencies = [ "quote", "syn", + "workspace-hack", ] [[package]] @@ -3415,6 +3420,7 @@ dependencies = [ "tracing", "tracing-subscriber", "uuid", + "workspace-hack", ] [[package]] @@ -3424,6 +3430,7 @@ dependencies = [ "anyhow", "libc", "mz-ore", + "workspace-hack", ] [[package]] @@ -3432,6 +3439,7 @@ version = "0.0.0" dependencies = [ "compile-time-run", "semver", + "workspace-hack", ] [[package]] @@ -3452,6 +3460,7 @@ dependencies = [ "tokio", "tracing", "url", + "workspace-hack", ] [[package]] @@ -3467,6 +3476,7 @@ dependencies = [ "serde", "serde_json", "uuid", + "workspace-hack", ] [[package]] @@ -3505,6 +3515,7 @@ dependencies = [ "tokio", "tracing", "uuid", + "workspace-hack", ] [[package]] @@ -3546,6 +3557,7 @@ dependencies = [ "tonic-build", "tracing", "uuid", + "workspace-hack", ] [[package]] @@ -3569,6 +3581,7 @@ dependencies = [ "timely", "tokio", "uuid", + "workspace-hack", ] [[package]] @@ -3659,6 +3672,7 @@ dependencies = [ "tracing-subscriber", "url", "uuid", + "workspace-hack", ] [[package]] @@ -3709,6 +3723,7 @@ dependencies = [ "sha2", "uncased", "uuid", + "workspace-hack", ] [[package]] @@ -3724,6 +3739,7 @@ dependencies = [ "proc-macro2", "serde", "serde_json", + "workspace-hack", ] [[package]] @@ -3741,6 +3757,7 @@ dependencies = [ "tokio", "tracing", "uuid", + "workspace-hack", ] [[package]] @@ -3757,6 +3774,7 @@ dependencies = [ "serde_json", "tracing", "tracing-subscriber", + "workspace-hack", ] [[package]] @@ -3786,6 +3804,7 @@ dependencies = [ "tokio", "tracing", "uuid", + "workspace-hack", ] [[package]] @@ -3811,6 +3830,7 @@ dependencies = [ "tokio", "tracing", "url", + "workspace-hack", ] [[package]] @@ -3818,6 +3838,7 @@ name = "mz-kinesis-util" version = "0.0.0" dependencies = [ "aws-sdk-kinesis", + "workspace-hack", ] [[package]] @@ -3831,6 +3852,7 @@ dependencies = [ "proc-macro2", "serde", "serde_json", + "workspace-hack", ] [[package]] @@ -3840,6 +3862,7 @@ dependencies = [ "proc-macro2", "quote", "syn", + "workspace-hack", ] [[package]] @@ -3848,6 +3871,7 @@ version = "0.0.0" dependencies = [ "reqwest", "serde", + "workspace-hack", ] [[package]] @@ -3861,6 +3885,7 @@ dependencies = [ "tokio", "tokio-postgres", "tracing", + "workspace-hack", ] [[package]] @@ -3875,6 +3900,7 @@ dependencies = [ "sha2", "tar", "walkdir", + "workspace-hack", ] [[package]] @@ -3893,6 +3919,7 @@ dependencies = [ "protobuf-src", "serde", "tonic-build", + "workspace-hack", ] [[package]] @@ -3916,6 +3943,7 @@ dependencies = [ "serde_json", "sha2", "tracing", + "workspace-hack", ] [[package]] @@ -3941,6 +3969,7 @@ dependencies = [ "sysinfo", "tokio", "tracing", + "workspace-hack", ] [[package]] @@ -3958,6 +3987,7 @@ dependencies = [ "mz-repr", "opentelemetry", "tracing-subscriber", + "workspace-hack", ] [[package]] @@ -3999,6 +4029,7 @@ dependencies = [ "tracing", "tracing-opentelemetry", "tracing-subscriber", + "workspace-hack", ] [[package]] @@ -4020,6 +4051,7 @@ dependencies = [ "tokio-postgres", "tracing", "tracing-subscriber", + "workspace-hack", ] [[package]] @@ -4061,6 +4093,7 @@ dependencies = [ "tracing", "url", "uuid", + "workspace-hack", ] [[package]] @@ -4104,6 +4137,7 @@ dependencies = [ "tokio", "tracing", "uuid", + "workspace-hack", ] [[package]] @@ -4111,6 +4145,7 @@ name = "mz-persist-types" version = "0.0.0" dependencies = [ "bytes", + "workspace-hack", ] [[package]] @@ -4121,6 +4156,7 @@ dependencies = [ "csv", "mz-pgrepr", "mz-repr", + "workspace-hack", ] [[package]] @@ -4135,6 +4171,7 @@ dependencies = [ "once_cell", "postgres-types", "uuid", + "workspace-hack", ] [[package]] @@ -4150,6 +4187,7 @@ dependencies = [ "postgres-protocol", "serde", "serde_json", + "workspace-hack", ] [[package]] @@ -4176,6 +4214,7 @@ dependencies = [ "tokio-openssl", "tokio-util", "tracing", + "workspace-hack", ] [[package]] @@ -4186,6 +4225,7 @@ dependencies = [ "libc", "mz-ore", "tempfile", + "workspace-hack", ] [[package]] @@ -4210,6 +4250,7 @@ dependencies = [ "tokio-postgres", "tonic-build", "tracing", + "workspace-hack", ] [[package]] @@ -4237,6 +4278,7 @@ dependencies = [ "tikv-jemalloc-ctl", "tokio", "tracing", + "workspace-hack", ] [[package]] @@ -4256,6 +4298,7 @@ dependencies = [ "tokio-postgres", "url", "uuid", + "workspace-hack", ] [[package]] @@ -4300,6 +4343,7 @@ dependencies = [ "tracing-subscriber", "url", "uuid", + "workspace-hack", ] [[package]] @@ -4312,6 +4356,7 @@ dependencies = [ "mz-ore", "mz-repr", "proc-macro2", + "workspace-hack", ] [[package]] @@ -4329,6 +4374,7 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", + "workspace-hack", ] [[package]] @@ -4338,6 +4384,7 @@ dependencies = [ "anyhow", "async-trait", "mz-repr", + "workspace-hack", ] [[package]] @@ -4350,6 +4397,7 @@ dependencies = [ "tokio", "tracing", "uuid", + "workspace-hack", ] [[package]] @@ -4378,6 +4426,7 @@ dependencies = [ "tonic", "tower", "tracing", + "workspace-hack", ] [[package]] @@ -4428,6 +4477,7 @@ dependencies = [ "typemap_rev", "uncased", "uuid", + "workspace-hack", ] [[package]] @@ -4446,6 +4496,7 @@ dependencies = [ "tracing", "uncased", "unicode-width", + "workspace-hack", ] [[package]] @@ -4487,6 +4538,7 @@ dependencies = [ "tower-http", "uuid", "walkdir", + "workspace-hack", ] [[package]] @@ -4502,6 +4554,7 @@ dependencies = [ "ssh-key", "tempfile", "tracing", + "workspace-hack", "zeroize", ] @@ -4526,6 +4579,7 @@ dependencies = [ "tokio", "tokio-postgres", "tracing", + "workspace-hack", ] [[package]] @@ -4546,6 +4600,7 @@ dependencies = [ "serde_json", "tokio", "tokio-postgres", + "workspace-hack", ] [[package]] @@ -4618,6 +4673,7 @@ dependencies = [ "tracing-subscriber", "url", "uuid", + "workspace-hack", ] [[package]] @@ -4674,6 +4730,7 @@ dependencies = [ "tracing-subscriber", "url", "uuid", + "workspace-hack", ] [[package]] @@ -4689,6 +4746,7 @@ dependencies = [ "tokio", "tokio-postgres", "tracing", + "workspace-hack", ] [[package]] @@ -4760,6 +4818,7 @@ dependencies = [ "url", "uuid", "walkdir", + "workspace-hack", ] [[package]] @@ -4775,6 +4834,7 @@ dependencies = [ "timely", "timely_communication", "tokio", + "workspace-hack", ] [[package]] @@ -4797,6 +4857,7 @@ dependencies = [ "serde_json", "tracing", "typemap_rev", + "workspace-hack", ] [[package]] @@ -4810,6 +4871,7 @@ dependencies = [ "quote", "syn", "tempfile", + "workspace-hack", ] [[package]] @@ -7873,6 +7935,113 @@ dependencies = [ "winapi", ] +[[package]] +name = "workspace-hack" +version = "0.0.0" +dependencies = [ + "anyhow", + "aws-sdk-sts", + "aws-sig-auth", + "aws-sigv4", + "aws-smithy-http", + "aws-types", + "axum", + "base64", + "bstr", + "byteorder", + "bytes", + "cc", + "chrono", + "clap", + "criterion", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-utils", + "crypto-common", + "dec", + "digest", + "either", + "flate2", + "frunk_core", + "futures", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", + "globset", + "hashbrown", + "hyper", + "indexmap", + "k8s-openapi", + "kube", + "kube-client", + "kube-core", + "libc", + "log", + "lru", + "memchr", + "native-tls", + "nix", + "nom", + "num-bigint", + "num-integer", + "num-traits", + "once_cell", + "openssl", + "openssl-sys", + "ordered-float", + "parking_lot", + "phf", + "phf_shared", + "postgres", + "postgres-types", + "proc-macro2", + "prometheus", + "prost", + "prost-reflect", + "prost-types", + "quote", + "rand", + "rdkafka-sys", + "regex", + "regex-syntax", + "reqwest", + "ring", + "schemars", + "scopeguard", + "security-framework", + "semver", + "serde", + "serde_json", + "sha2", + "smallvec", + "socket2", + "syn", + "textwrap", + "tikv-jemalloc-sys", + "time", + "time-macros", + "timely", + "timely_communication", + "tokio", + "tokio-postgres", + "tokio-stream", + "tokio-util", + "tower", + "tower-http", + "tracing", + "tracing-core", + "tracing-subscriber", + "uncased", + "url", + "uuid", + "zeroize", +] + [[package]] name = "wyz" version = "0.5.0" diff --git a/Cargo.toml b/Cargo.toml index 866208644613..c4ef5fa5bfe7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,6 +59,7 @@ members = [ "src/transform", "src/cloud-resources", "src/walkabout", + "src/workspace-hack", "test/metabase/smoketest", "test/perf-kinesis", "test/test-util", diff --git a/bin/lint b/bin/lint index 311477aa91cb..7d95bf28f935 100755 --- a/bin/lint +++ b/bin/lint @@ -44,6 +44,7 @@ copyright_files=$(grep -vE \ -e '(^|/)go\.sum$' \ -e '(^|/)(Cargo|askama)\.toml$' \ -e '^\.cargo/config$' \ + -e '^\.config/hakari.toml$' \ -e '^Cargo\.lock$' \ -e '^about\.toml$' \ -e '^deny\.toml$' \ diff --git a/ci/builder/Dockerfile b/ci/builder/Dockerfile index 0777abf8e8fb..f9c4afb78113 100644 --- a/ci/builder/Dockerfile +++ b/ci/builder/Dockerfile @@ -154,6 +154,7 @@ RUN mkdir rust \ && cargo install --root /usr/local --version "=0.5.2" cargo-about \ && cargo install --root /usr/local --version "=1.40.5" cargo-deb \ && cargo install --root /usr/local --version "=0.12.2" cargo-deny \ + && cargo install --root /usr/local --version ="0.9.17" cargo-hakari \ && cargo install --root /usr/local --version "=0.9.44" cargo-nextest \ && cargo install --root /usr/local --version "=0.1.34" cargo-udeps --features=vendored-openssl \ && cargo install --root /usr/local --version "=0.2.15" --no-default-features --features=s3,openssl/vendored sccache diff --git a/ci/test/lint-fast.sh b/ci/test/lint-fast.sh index d50015a2f097..5ef62fb4f0f7 100755 --- a/ci/test/lint-fast.sh +++ b/ci/test/lint-fast.sh @@ -18,6 +18,8 @@ set -euo pipefail ci_try bin/lint ci_try cargo --locked fmt -- --check ci_try cargo --locked deny check licenses bans sources +ci_try cargo hakari generate --diff +ci_try cargo hakari manage-deps --dry-run # Smoke out failures in generating the license metadata page, even though we # don't care about its output in the test pipeline, so that we don't only diff --git a/deny.toml b/deny.toml index 1bbd58696e56..b84a80a11608 100644 --- a/deny.toml +++ b/deny.toml @@ -62,6 +62,7 @@ wrappers = [ "ureq", "want", "wasm-bindgen-backend", + "workspace-hack", ] # We prefer the system's native TLS or OpenSSL to Rustls, since they are more diff --git a/doc/developer/guide.md b/doc/developer/guide.md index f06c56aa6a3a..b8ca56ba3e13 100644 --- a/doc/developer/guide.md +++ b/doc/developer/guide.md @@ -320,6 +320,25 @@ specifying the `--roots` flag with a comma separated list of crates: bin/crate-diagram --roots mz-sql,mz-dataflow ``` +#### `workspace-hack` + +The [`workspace-hack`](../../src/workspace-hack/) crate speeds up rebuilds by +ensuring that all crates use the same features of all transitive dependencies in +the graph. This prevents Cargo from recompiling huge chunks of the dependency +graph when you move between crates in the worksapce. For details, see the +[hakari documentation]. + +If you add or remove dependencies on crates, you will likely need to regenerate +the `workspace-hack` crate. You can do this by running: + +``` +cargo install cargo-hakari +cargo hakari generate +cargo hakari manage-deps +``` + +CI will enforce that the `workspace-hack` crate is kept up to date. + ## Other repositories Where possible, we prefer to keep things in the main repository (a "monorepo" @@ -458,6 +477,7 @@ source /path/to/materialize/misc/completions/zsh/* [demos]: https://github.com/MaterializeInc/demos [Docker Compose]: https://docs.docker.com/compose/ [github-https]: https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line +[hakari documentation]: https://docs.rs/cargo-hakari/latest/cargo_hakari/about/index.html [Homebrew]: https://brew.sh [Kubernetes]: https://kubernetes.io [materialize-dbt-utils]: https://github.com/MaterializeInc/materialize-dbt-utils diff --git a/src/adapter/Cargo.toml b/src/adapter/Cargo.toml index 8311cd0bba0c..7c0d795a78dd 100644 --- a/src/adapter/Cargo.toml +++ b/src/adapter/Cargo.toml @@ -64,6 +64,7 @@ tracing-subscriber = "0.3.16" thiserror = "1.0.37" uncased = "0.9.7" uuid = { version = "1.2.2", features = ["v4"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] criterion = { version = "0.4.0", features = ["async_tokio"] } diff --git a/src/audit-log/Cargo.toml b/src/audit-log/Cargo.toml index cb4c3bb16cbe..6ea5463869f0 100644 --- a/src/audit-log/Cargo.toml +++ b/src/audit-log/Cargo.toml @@ -12,3 +12,4 @@ mz-ore = { path = "../ore" } serde = { version = "1.0.147", features = ["derive"] } serde_json = "1.0.89" serde_plain = "1.0.1" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/avro-derive/Cargo.toml b/src/avro-derive/Cargo.toml index 00a6709fcc08..b3ba79e6e8f3 100644 --- a/src/avro-derive/Cargo.toml +++ b/src/avro-derive/Cargo.toml @@ -12,3 +12,4 @@ proc-macro = true [dependencies] quote = "1.0.21" syn = { version = "1.0.103", features = ["full"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/avro/Cargo.toml b/src/avro/Cargo.toml index 3263701c3ad2..143b0e5ded73 100644 --- a/src/avro/Cargo.toml +++ b/src/avro/Cargo.toml @@ -29,6 +29,7 @@ sha2 = "0.10.6" snap = { version = "1.1.0", optional = true } tracing = "0.1.37" uuid = "1.2.2" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] once_cell = "1.16.0" diff --git a/src/billing-demo/Cargo.toml b/src/billing-demo/Cargo.toml index 5350aedd3657..872c8df8a617 100644 --- a/src/billing-demo/Cargo.toml +++ b/src/billing-demo/Cargo.toml @@ -22,6 +22,7 @@ tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.37" tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } uuid = { version = "1.2.2", features = ["v4"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [build-dependencies] prost-build = "0.11.2" diff --git a/src/build-id/Cargo.toml b/src/build-id/Cargo.toml index acac7c6a36e8..fef77b29c1ed 100644 --- a/src/build-id/Cargo.toml +++ b/src/build-id/Cargo.toml @@ -15,3 +15,4 @@ repository = "https://github.com/MaterializeInc/materialize" anyhow = "1.0.66" libc = "0.2.137" mz-ore = { path = "../ore", features = ["async"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/build-info/Cargo.toml b/src/build-info/Cargo.toml index 21c181b5e107..4b20a50c4c62 100644 --- a/src/build-info/Cargo.toml +++ b/src/build-info/Cargo.toml @@ -9,6 +9,7 @@ publish = false [dependencies] compile-time-run = "0.2.12" semver = { version = "1.0.14", optional = true } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [features] default = ["semver"] diff --git a/src/ccsr/Cargo.toml b/src/ccsr/Cargo.toml index 461bf42b6231..fd28b0b11e03 100644 --- a/src/ccsr/Cargo.toml +++ b/src/ccsr/Cargo.toml @@ -14,6 +14,7 @@ reqwest = { version = "0.11.13", features = ["blocking", "json", "native-tls-ven serde = { version = "1.0.147", features = ["derive"] } serde_json = "1.0.89" url = { version = "2.3.1", features = ["serde"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] hyper = { version = "0.14.23", features = ["server"] } diff --git a/src/cloud-resources/Cargo.toml b/src/cloud-resources/Cargo.toml index a6c0101d397e..4600ed7ed794 100644 --- a/src/cloud-resources/Cargo.toml +++ b/src/cloud-resources/Cargo.toml @@ -16,3 +16,4 @@ schemars = { version = "0.8", features = ["uuid1"] } serde = "1.0.147" serde_json = "1.0.89" uuid = { version = "1.2", features = ["serde", "v4"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/compute-client/Cargo.toml b/src/compute-client/Cargo.toml index 28ed25c0ba1d..f34c36011d00 100644 --- a/src/compute-client/Cargo.toml +++ b/src/compute-client/Cargo.toml @@ -40,6 +40,7 @@ tokio-stream = "0.1.11" tonic = "0.8.2" tracing = "0.1.37" uuid = { version = "1.2.2", features = ["serde", "v4"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [build-dependencies] protobuf-src = "1.1.0" diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml index 67acd295b21a..86eaf1e5d34a 100644 --- a/src/compute/Cargo.toml +++ b/src/compute/Cargo.toml @@ -38,6 +38,7 @@ timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-fe tokio = { version = "1.23.0", features = ["fs", "rt", "sync", "net"] } tracing = "0.1.37" uuid = { version = "1.2.2", features = ["serde", "v4"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [target.'cfg(not(target_os = "macos"))'.dependencies] # According to jemalloc developers, `background_threads` should always be diff --git a/src/controller/Cargo.toml b/src/controller/Cargo.toml index a54407fd68d9..c6d7ee551fb3 100644 --- a/src/controller/Cargo.toml +++ b/src/controller/Cargo.toml @@ -24,3 +24,4 @@ serde = { version = "1.0.147", features = ["derive"] } timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] } tokio = "1.23.0" uuid = { version = "1.2.2" } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index e398ea5b9bec..26bcc8b5d811 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -80,6 +80,7 @@ tracing = "0.1.37" tracing-subscriber = "0.3.16" url = "2.3.1" uuid = "1.2.2" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [target.'cfg(not(target_os = "macos"))'.dependencies] # According to jemalloc developers, `background_threads` should always be diff --git a/src/expr-test-util/Cargo.toml b/src/expr-test-util/Cargo.toml index 5351b58bedac..b7bb8e2c29c8 100644 --- a/src/expr-test-util/Cargo.toml +++ b/src/expr-test-util/Cargo.toml @@ -15,6 +15,7 @@ mz-repr-test-util = { path = "../repr-test-util" } proc-macro2 = "1.0.47" serde = { version = "1.0.147", features = ["derive"] } serde_json = "1.0.89" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] datadriven = "0.6.0" diff --git a/src/expr-test-util/tests/testdata/rel b/src/expr-test-util/tests/testdata/rel index 58abd814c097..e8a6d56f88b1 100644 --- a/src/expr-test-util/tests/testdata/rel +++ b/src/expr-test-util/tests/testdata/rel @@ -21,7 +21,7 @@ build [[#0]] [int64]) ---- -error: Punct { char: '#', spacing: Alone } cannot be interpreted as a literal. +error: Punct { char: '#', spacing: Alone, span: bytes(536..537) } cannot be interpreted as a literal. build (arrange_by diff --git a/src/expr-test-util/tests/testdata/scalar b/src/expr-test-util/tests/testdata/scalar index e53794f1262d..b2145f7c9156 100644 --- a/src/expr-test-util/tests/testdata/scalar +++ b/src/expr-test-util/tests/testdata/scalar @@ -80,12 +80,12 @@ build-scalar build-scalar (ok) ---- -error: expected literal after Ident(ok) +error: expected literal after Ident { sym: ok, span: bytes(4055..4057) } build-scalar (ok (ok true)) ---- -error: expected literal after Ident(ok) +error: expected literal after Ident { sym: ok, span: bytes(4061..4063) } build-scalar (err) diff --git a/src/expr/Cargo.toml b/src/expr/Cargo.toml index d99314ef83e2..2b925cd539ea 100644 --- a/src/expr/Cargo.toml +++ b/src/expr/Cargo.toml @@ -49,6 +49,7 @@ uncased = "0.9.7" uuid = "1.2.2" proptest = { git = "https://github.com/MaterializeInc/proptest.git", default-features = false, features = ["std"] } proptest-derive = { git = "https://github.com/MaterializeInc/proptest.git" } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] criterion = { version = "0.4.0" } diff --git a/src/frontegg-auth/Cargo.toml b/src/frontegg-auth/Cargo.toml index 41ef06327097..1d7580eb6f1b 100644 --- a/src/frontegg-auth/Cargo.toml +++ b/src/frontegg-auth/Cargo.toml @@ -18,3 +18,4 @@ thiserror = "1.0.37" tokio = { version = "1.23.0", features = ["macros"] } tracing = "0.1.37" uuid = { version = "1.2.2", features = ["serde"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/http-util/Cargo.toml b/src/http-util/Cargo.toml index f1d08081ebcc..b9bd9d962443 100644 --- a/src/http-util/Cargo.toml +++ b/src/http-util/Cargo.toml @@ -17,6 +17,7 @@ tracing-subscriber = "0.3.16" include_dir = "0.7.3" mz-ore = { path = "../ore", default-features = false, features = ["metrics", "tracing_"] } prometheus = { version = "0.13.3", default-features = false, features = ["process"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [package.metadata.cargo-udeps.ignore] # Only used in macro generated code diff --git a/src/interchange/Cargo.toml b/src/interchange/Cargo.toml index 4b3642c54721..165192307c47 100644 --- a/src/interchange/Cargo.toml +++ b/src/interchange/Cargo.toml @@ -31,6 +31,7 @@ serde_json = "1.0.89" timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode"] } tracing = "0.1.37" uuid = { version = "1.2.2", features = ["serde"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] criterion = { version = "0.4.0", features = ["async_tokio"] } diff --git a/src/kafka-util/Cargo.toml b/src/kafka-util/Cargo.toml index 9a8a16d2df51..2da673ec6ebe 100644 --- a/src/kafka-util/Cargo.toml +++ b/src/kafka-util/Cargo.toml @@ -24,6 +24,7 @@ tokio = { version = "1.23.0", features = ["macros", "sync"] } thiserror = "1.0.37" tracing = "0.1.37" url = "2.3.1" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [build-dependencies] prost-build = "0.11.2" diff --git a/src/kinesis-util/Cargo.toml b/src/kinesis-util/Cargo.toml index 6b7c042da46e..b04cbd350449 100644 --- a/src/kinesis-util/Cargo.toml +++ b/src/kinesis-util/Cargo.toml @@ -8,3 +8,4 @@ publish = false [dependencies] aws-sdk-kinesis = { version = "0.21.0", default-features = false, features = ["native-tls", "rt-tokio"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/lowertest-derive/Cargo.toml b/src/lowertest-derive/Cargo.toml index f5aa9effef3d..1fea6072972c 100644 --- a/src/lowertest-derive/Cargo.toml +++ b/src/lowertest-derive/Cargo.toml @@ -13,3 +13,4 @@ proc-macro = true proc-macro2 = "1.0.47" quote = "1.0.21" syn = { version = "1.0.103", features = ["extra-traits", "printing"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/lowertest/Cargo.toml b/src/lowertest/Cargo.toml index d1c342c2564a..b27c18f226e3 100644 --- a/src/lowertest/Cargo.toml +++ b/src/lowertest/Cargo.toml @@ -12,6 +12,7 @@ mz-ore = { path = "../ore" } proc-macro2 = "1.0.47" serde = { version = "1.0.147", features = ["derive"] } serde_json = "1.0.89" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] anyhow = "1.0.66" diff --git a/src/metabase/Cargo.toml b/src/metabase/Cargo.toml index aa686b5f22fe..41716639d46b 100644 --- a/src/metabase/Cargo.toml +++ b/src/metabase/Cargo.toml @@ -9,3 +9,4 @@ publish = false [dependencies] reqwest = { version = "0.11.13", features = ["json"] } serde = { version = "1.0.147", features = ["derive"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/mz/Cargo.toml b/src/mz/Cargo.toml index 6f78cb8f2475..23ff3e136df9 100644 --- a/src/mz/Cargo.toml +++ b/src/mz/Cargo.toml @@ -23,3 +23,4 @@ tokio = { version = "1.23.0", features = ["full"] } toml = "0.5.9" uuid = "1.2.2" url = "2.3.1" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/npm/Cargo.toml b/src/npm/Cargo.toml index ac66bd118cf0..254c8843a0a8 100644 --- a/src/npm/Cargo.toml +++ b/src/npm/Cargo.toml @@ -15,3 +15,4 @@ reqwest = { version = "0.11.13", features = ["blocking", "native-tls-vendored"] sha2 = "0.10.6" tar = "0.4.38" walkdir = "2.3.2" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/orchestrator-kubernetes/Cargo.toml b/src/orchestrator-kubernetes/Cargo.toml index 9e0b114bd194..cd3d469a094f 100644 --- a/src/orchestrator-kubernetes/Cargo.toml +++ b/src/orchestrator-kubernetes/Cargo.toml @@ -24,3 +24,4 @@ serde = { version = "1.0.147", features = ["derive"] } serde_json = "1.0.89" sha2 = "0.10.6" tracing = "0.1.37" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/orchestrator-process/Cargo.toml b/src/orchestrator-process/Cargo.toml index 4cdcb2e5952c..5e0e6c1288de 100644 --- a/src/orchestrator-process/Cargo.toml +++ b/src/orchestrator-process/Cargo.toml @@ -26,3 +26,4 @@ sha1 = "0.10.5" sysinfo = "0.27.0" tokio = { version = "1.23.0", features = [ "fs", "process", "time" ] } tracing = "0.1.37" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/orchestrator-tracing/Cargo.toml b/src/orchestrator-tracing/Cargo.toml index 6bd4c4c6078c..210e86a7c16a 100644 --- a/src/orchestrator-tracing/Cargo.toml +++ b/src/orchestrator-tracing/Cargo.toml @@ -18,6 +18,7 @@ mz-ore = { path = "../ore", features = ["tracing_", "cli"] } mz-repr = { path = "../repr", optional = true } tracing-subscriber = { version = "0.3.16", default-features = false } opentelemetry = { git = "https://github.com/MaterializeInc/opentelemetry-rust.git", features = ["rt-tokio", "trace"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [features] tokio-console = ["mz-ore/tokio-console", "mz-repr", "humantime"] diff --git a/src/orchestrator/Cargo.toml b/src/orchestrator/Cargo.toml index 6becda207325..fe3bc36b06fb 100644 --- a/src/orchestrator/Cargo.toml +++ b/src/orchestrator/Cargo.toml @@ -17,6 +17,7 @@ mz-ore = { path = "../ore"} mz-proto = { path = "../proto" } prost = { version = "0.11.3", features = ["no-recursion-limit"] } serde = "1.0" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [build-dependencies] protobuf-src = "1.1.0" diff --git a/src/ore/Cargo.toml b/src/ore/Cargo.toml index ad123f3b265c..a37ee19ac9ca 100644 --- a/src/ore/Cargo.toml +++ b/src/ore/Cargo.toml @@ -58,6 +58,7 @@ opentelemetry = { git = "https://github.com/MaterializeInc/opentelemetry-rust.gi opentelemetry-otlp = { git = "https://github.com/MaterializeInc/opentelemetry-rust.git", optional = true } console-subscriber = { git = "https://github.com/MaterializeInc/console.git", optional = true } sentry-tracing = { version = "0.29.0", optional = true } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] anyhow = { version = "1.0.66" } diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml index 487d8e994e5a..7d968a899f63 100644 --- a/src/persist-client/Cargo.toml +++ b/src/persist-client/Cargo.toml @@ -53,6 +53,7 @@ timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-fe tokio = { version = "1.23.0", default-features = false, features = ["macros", "sync", "rt", "rt-multi-thread", "time"] } tracing = "0.1.37" uuid = { version = "1.2.2", features = ["v4"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [features] tokio-console = ["mz-ore/tokio-console"] diff --git a/src/persist-types/Cargo.toml b/src/persist-types/Cargo.toml index 4ab86fcd8832..c02832bb6f64 100644 --- a/src/persist-types/Cargo.toml +++ b/src/persist-types/Cargo.toml @@ -10,3 +10,4 @@ publish = false # don't leak in dependencies on other Materialize packages. [dependencies] bytes = "1.3.0" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/persist/Cargo.toml b/src/persist/Cargo.toml index db2cf948b911..997d266de7c7 100644 --- a/src/persist/Cargo.toml +++ b/src/persist/Cargo.toml @@ -50,6 +50,7 @@ tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.37" url = "2.3.1" uuid = { version = "1.2.2", features = ["v4"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] mz-ore = { path = "../ore", default-features = false, features = ["test"] } diff --git a/src/pgcopy/Cargo.toml b/src/pgcopy/Cargo.toml index 856a05b4d5cc..dfde9fb5a5bf 100644 --- a/src/pgcopy/Cargo.toml +++ b/src/pgcopy/Cargo.toml @@ -11,3 +11,4 @@ bytes = "1.3.0" csv = "1.1.6" mz-pgrepr = { path = "../pgrepr" } mz-repr = { path = "../repr" } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/pgrepr/Cargo.toml b/src/pgrepr/Cargo.toml index 463c41b0a9d1..d0fa1dfefb31 100644 --- a/src/pgrepr/Cargo.toml +++ b/src/pgrepr/Cargo.toml @@ -15,3 +15,4 @@ once_cell = "1.16.0" mz-repr = { path = "../repr" } postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["with-chrono-0_4", "with-uuid-1"] } uuid = "1.2.2" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/pgtest/Cargo.toml b/src/pgtest/Cargo.toml index b0eadf931b3b..cda7f10527ae 100644 --- a/src/pgtest/Cargo.toml +++ b/src/pgtest/Cargo.toml @@ -16,3 +16,4 @@ mz-ore = { path = "../ore", features = ["cli"] } postgres-protocol = { git = "https://github.com/MaterializeInc/rust-postgres" } serde = { version = "1.0.147", features = ["derive"] } serde_json = "1.0.89" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/pgwire/Cargo.toml b/src/pgwire/Cargo.toml index e81c696a9dd1..ddeb49a933c5 100644 --- a/src/pgwire/Cargo.toml +++ b/src/pgwire/Cargo.toml @@ -27,3 +27,4 @@ tokio = "1.23.0" tokio-openssl = "0.6.3" tokio-util = { version = "0.7.4", features = ["codec"] } tracing = "0.1.37" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/pid-file/Cargo.toml b/src/pid-file/Cargo.toml index f85a49ed9095..5892e93ddb62 100644 --- a/src/pid-file/Cargo.toml +++ b/src/pid-file/Cargo.toml @@ -9,6 +9,7 @@ publish = false [dependencies] libc = "0.2.137" mz-ore = { path = "../ore", default-features = false } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] tempfile = "3.2.0" diff --git a/src/postgres-util/Cargo.toml b/src/postgres-util/Cargo.toml index 68806b377267..966bc9a417f3 100644 --- a/src/postgres-util/Cargo.toml +++ b/src/postgres-util/Cargo.toml @@ -23,6 +23,7 @@ thiserror = "1.0.37" tokio = { version = "1.23.0", features = ["fs", "rt", "sync"] } tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.37" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [build-dependencies] protobuf-src = "1.1.0" diff --git a/src/prof/Cargo.toml b/src/prof/Cargo.toml index 22269d64b0e0..cc7ad8096996 100644 --- a/src/prof/Cargo.toml +++ b/src/prof/Cargo.toml @@ -26,6 +26,7 @@ serde = { version = "1.0.147", features = ["derive"] } tempfile = "3.2.0" tracing = "0.1.37" tokio = { version = "1.23.0", features = ["time"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [target.'cfg(not(target_os = "macos"))'.dependencies] tikv-jemalloc-ctl = { version = "0.4.1", features = ["use_std"], optional = true } diff --git a/src/proto/Cargo.toml b/src/proto/Cargo.toml index 1c1345697bd7..8852ca8c2a8a 100644 --- a/src/proto/Cargo.toml +++ b/src/proto/Cargo.toml @@ -19,6 +19,7 @@ serde_json = { version = "1.0.89", features = ["arbitrary_precision"] } tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", optional = true } url = { version = "2.3.1", features = ["serde"] } uuid = "1.2.2" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [build-dependencies] prost-build = "0.11.2" diff --git a/src/repr-test-util/Cargo.toml b/src/repr-test-util/Cargo.toml index 39737712ce43..6c89826e8efe 100644 --- a/src/repr-test-util/Cargo.toml +++ b/src/repr-test-util/Cargo.toml @@ -12,6 +12,7 @@ mz-lowertest = { path = "../lowertest" } mz-ore = { path = "../ore" } mz-repr = { path = "../repr" } proc-macro2 = "1.0.47" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] datadriven = "0.6.0" diff --git a/src/repr/Cargo.toml b/src/repr/Cargo.toml index 0189ea793685..3ccc6cec4b52 100644 --- a/src/repr/Cargo.toml +++ b/src/repr/Cargo.toml @@ -51,6 +51,7 @@ thiserror = "1.0.37" # for the tracing_ feature tracing = { version = "0.1.37", optional = true } tracing-subscriber = { version = "0.3.16", default-features = false, optional = true } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] criterion = { version = "0.4.0" } diff --git a/src/s3-datagen/Cargo.toml b/src/s3-datagen/Cargo.toml index 0d8bf8ec6887..45d2eb01acb1 100644 --- a/src/s3-datagen/Cargo.toml +++ b/src/s3-datagen/Cargo.toml @@ -18,3 +18,4 @@ mz-ore = { path = "../ore", features = ["cli"] } tokio = { version = "1.23.0", features = ["macros", "net", "rt", "rt-multi-thread", "time"] } tracing = "0.1.37" tracing-subscriber = { version = "0.3.16", default-features = false, features = ["env-filter", "fmt"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/secrets/Cargo.toml b/src/secrets/Cargo.toml index 7eaa8632f801..0f009f363aab 100644 --- a/src/secrets/Cargo.toml +++ b/src/secrets/Cargo.toml @@ -10,3 +10,4 @@ publish = false anyhow = "1.0.66" mz-repr = { path = "../repr" } async-trait = "0.1.59" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/segment/Cargo.toml b/src/segment/Cargo.toml index 97d058f9ae31..2d4b064f6983 100644 --- a/src/segment/Cargo.toml +++ b/src/segment/Cargo.toml @@ -13,3 +13,4 @@ serde_json = "1.0.89" tokio = { version = "1.23.0", features = ["sync"] } tracing = "0.1.37" uuid = "1.2.2" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index 47dce2bf107a..7f5ecfc630bb 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -29,3 +29,4 @@ tonic = "0.8.2" tower = "0.4.13" tracing = "0.1.37" sentry-tracing = "0.29.0" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/sql-parser/Cargo.toml b/src/sql-parser/Cargo.toml index cc126b3332dd..a72a437588fc 100644 --- a/src/sql-parser/Cargo.toml +++ b/src/sql-parser/Cargo.toml @@ -15,6 +15,7 @@ phf = { version = "0.11.1", features = ["uncased"] } serde = { version = "1.0.147", features = ["derive"] } tracing = "0.1.37" uncased = "0.9.7" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] datadriven = "0.6.0" diff --git a/src/sql/Cargo.toml b/src/sql/Cargo.toml index 4ee297605701..7687fbe658cf 100644 --- a/src/sql/Cargo.toml +++ b/src/sql/Cargo.toml @@ -48,6 +48,7 @@ tracing = "0.1.37" typemap_rev = "0.3.0" uncased = "0.9.7" uuid = { version = "1.2.2", features = ["serde", "v4"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] datadriven = "0.6.0" diff --git a/src/sqllogictest/Cargo.toml b/src/sqllogictest/Cargo.toml index 329fee36f673..9250152102db 100644 --- a/src/sqllogictest/Cargo.toml +++ b/src/sqllogictest/Cargo.toml @@ -42,3 +42,4 @@ tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", feat tower-http = { version = "0.3.4", features = ["cors"] } uuid = "1.2.2" walkdir = "2.3.2" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/ssh-util/Cargo.toml b/src/ssh-util/Cargo.toml index 32d01ba65bab..be7402628616 100644 --- a/src/ssh-util/Cargo.toml +++ b/src/ssh-util/Cargo.toml @@ -17,3 +17,4 @@ ssh-key = { version = "0.4.3" } tempfile = "3.3.0" tracing = "0.1.37" zeroize = { version = "1.5.7", features = ["serde"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/stash-debug/Cargo.toml b/src/stash-debug/Cargo.toml index 42ad44a6feb1..4a28a4d426cf 100644 --- a/src/stash-debug/Cargo.toml +++ b/src/stash-debug/Cargo.toml @@ -21,3 +21,4 @@ once_cell = "1.16.0" serde_json = "1.0.89" tokio = "1.23.0" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = [ "with-serde_json-1" ] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/stash/Cargo.toml b/src/stash/Cargo.toml index 3dfb42cff7e7..bb19008306c5 100644 --- a/src/stash/Cargo.toml +++ b/src/stash/Cargo.toml @@ -24,6 +24,7 @@ timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-fe tokio = "1.23.0" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = [ "with-serde_json-1" ] } tracing = "0.1.37" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] anyhow = "1.0.66" diff --git a/src/storage-client/Cargo.toml b/src/storage-client/Cargo.toml index 4c1cc1149d10..5235c75dd134 100644 --- a/src/storage-client/Cargo.toml +++ b/src/storage-client/Cargo.toml @@ -55,6 +55,7 @@ tracing = "0.1.37" tracing-subscriber = "0.3.16" url = { version = "2.3.1", features = ["serde"] } uuid = { version = "1.2.2", features = ["serde", "v4"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [build-dependencies] protobuf-src = "1.1.0" diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index 0382a0560473..4e2af8129478 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -69,6 +69,7 @@ tracing-subscriber = "0.3.16" thiserror = { version = "1.0.37" } url = { version = "2.3.1", features = ["serde"] } uuid = { version = "1.2.2", features = ["serde", "v4"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [build-dependencies] protobuf-src = "1.1.0" diff --git a/src/testdrive/Cargo.toml b/src/testdrive/Cargo.toml index 4777a309aa58..0e9a17c3408c 100644 --- a/src/testdrive/Cargo.toml +++ b/src/testdrive/Cargo.toml @@ -72,3 +72,4 @@ tokio-util = { version = "0.7.4", features = ["compat"] } url = "2.3.1" uuid = "1.2.2" walkdir = "2.3.2" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/timely-util/Cargo.toml b/src/timely-util/Cargo.toml index f51c102d09b7..c38fd5168fe1 100644 --- a/src/timely-util/Cargo.toml +++ b/src/timely-util/Cargo.toml @@ -15,6 +15,7 @@ timely_communication = { git = "https://github.com/TimelyDataflow/timely-dataflo serde = { version = "1.0.147", features = ["derive"] } mz-ore = { path = "../ore", features = ["tracing_"] } polonius-the-crab = "0.3.1" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] tokio = { version = "1.23.0", features = ["macros", "rt-multi-thread", "time"] } diff --git a/src/transform/Cargo.toml b/src/transform/Cargo.toml index 46621caa9c21..d631bb54850b 100644 --- a/src/transform/Cargo.toml +++ b/src/transform/Cargo.toml @@ -17,6 +17,7 @@ num-traits = "0.2" num-derive = "0.3" tracing = "0.1.37" typemap_rev = "0.3.0" +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] anyhow = "1.0.66" diff --git a/src/walkabout/Cargo.toml b/src/walkabout/Cargo.toml index 0bc548f88f8b..91811f27dc46 100644 --- a/src/walkabout/Cargo.toml +++ b/src/walkabout/Cargo.toml @@ -12,6 +12,7 @@ itertools = "0.10.5" mz-ore = { path = "../ore", default-features = false } quote = "1.0.21" syn = { version = "1.0.103", features = ["extra-traits", "full", "parsing"] } +workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] datadriven = "0.6.0" diff --git a/src/workspace-hack/.gitattributes b/src/workspace-hack/.gitattributes new file mode 100644 index 000000000000..3e9dba4b64b5 --- /dev/null +++ b/src/workspace-hack/.gitattributes @@ -0,0 +1,4 @@ +# 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/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml new file mode 100644 index 000000000000..02727e3a757c --- /dev/null +++ b/src/workspace-hack/Cargo.toml @@ -0,0 +1,238 @@ +[package] +name = "workspace-hack" +description = "workspace-hack package, managed by hakari" +version = "0.0.0" +edition.workspace = true +rust-version.workspace = true +publish = false + +# The parts of the file between the BEGIN HAKARI SECTION and END HAKARI SECTION +# comments are managed by hakari. +# +# To regenerate, run: +# cargo hakari generate + +### BEGIN HAKARI SECTION +[dependencies] +anyhow = { version = "1.0.66", features = ["backtrace", "std"] } +aws-sdk-sts = { version = "0.21.0", default-features = false, features = ["native-tls", "rt-tokio"] } +aws-sig-auth = { version = "0.51.0", default-features = false, features = ["aws-smithy-eventstream", "sign-eventstream"] } +aws-sigv4 = { version = "0.51.0", features = ["aws-smithy-eventstream", "bytes", "form_urlencoded", "http", "percent-encoding", "sign-eventstream", "sign-http"] } +aws-smithy-http = { version = "0.51.0", default-features = false, features = ["aws-smithy-eventstream", "event-stream", "rt-tokio", "tokio", "tokio-util"] } +aws-types = { version = "0.51.0", default-features = false, features = ["hardcoded-credentials"] } +axum = { version = "0.5.17", features = ["form", "headers", "http1", "json", "matched-path", "original-uri", "query", "serde_json", "serde_urlencoded", "tower-log"] } +base64 = { version = "0.13.1", features = ["alloc", "std"] } +bstr = { version = "0.2.14", features = ["lazy_static", "regex-automata", "serde", "serde1", "serde1-nostd", "std", "unicode"] } +byteorder = { version = "1.4.3", features = ["std"] } +bytes = { version = "1.3.0", features = ["std"] } +chrono = { version = "0.4.23", default-features = false, features = ["alloc", "clock", "iana-time-zone", "serde", "std", "winapi"] } +clap = { version = "3.2.20", features = ["atty", "clap_derive", "color", "derive", "env", "once_cell", "std", "strsim", "suggestions", "termcolor", "terminal_size", "wrap_help"] } +criterion = { version = "0.4.0", features = ["async", "async_tokio", "cargo_bench_support", "futures", "html_reports", "plotters", "rayon", "tokio"] } +crossbeam-channel = { version = "0.5.6", features = ["crossbeam-utils", "std"] } +crossbeam-deque = { version = "0.8.1", features = ["crossbeam-epoch", "crossbeam-utils", "std"] } +crossbeam-epoch = { version = "0.9.13", features = ["alloc", "std"] } +crossbeam-utils = { version = "0.8.7", features = ["lazy_static", "std"] } +crypto-common = { version = "0.1.3", default-features = false, features = ["std"] } +dec = { version = "0.4.8", default-features = false, features = ["serde"] } +digest = { version = "0.10.6", features = ["alloc", "block-buffer", "core-api", "mac", "std", "subtle"] } +either = { version = "1.8.0", features = ["use_std"] } +flate2 = { version = "1.0.24", features = ["any_zlib", "libz-sys", "miniz_oxide", "rust_backend", "zlib"] } +frunk_core = { version = "0.4.0", default-features = false, features = ["std"] } +futures = { version = "0.3.25", features = ["alloc", "async-await", "executor", "futures-executor", "std"] } +futures-channel = { version = "0.3.25", features = ["alloc", "futures-sink", "sink", "std"] } +futures-core = { version = "0.3.25", features = ["alloc", "std"] } +futures-executor = { version = "0.3.25", features = ["std"] } +futures-io = { version = "0.3.25", features = ["std"] } +futures-sink = { version = "0.3.25", features = ["alloc", "std"] } +futures-task = { version = "0.3.25", features = ["alloc", "std"] } +futures-util = { version = "0.3.25", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "sink", "slab", "std"] } +globset = { version = "0.4.9", features = ["log", "serde", "serde1"] } +hashbrown = { git = "https://github.com/MaterializeInc/hashbrown.git", features = ["ahash", "inline-more", "raw"] } +hyper = { version = "0.14.23", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] } +indexmap = { version = "1.9.1", default-features = false, features = ["std"] } +k8s-openapi = { version = "0.16.0", features = ["api", "http", "percent-encoding", "url", "v1_22"] } +kube = { version = "0.76.0", features = ["client", "config", "derive", "kube-client", "kube-derive", "kube-runtime", "openssl-tls", "runtime", "ws"] } +kube-client = { version = "0.76.0", default-features = false, features = ["__non_core", "base64", "bytes", "chrono", "client", "config", "dirs", "either", "futures", "http-body", "hyper", "hyper-openssl", "hyper-timeout", "jsonpatch", "jsonpath_lib", "openssl", "openssl-tls", "pem", "pin-project", "rand", "serde_yaml", "tokio", "tokio-tungstenite", "tokio-util", "tower", "tower-http", "tracing", "ws"] } +kube-core = { version = "0.76.0", default-features = false, features = ["json-patch", "jsonpatch", "schema", "schemars", "ws"] } +libc = { version = "0.2.137", features = ["extra_traits", "std"] } +log = { version = "0.4.17", default-features = false, features = ["std"] } +lru = { version = "0.8.1", features = ["hashbrown"] } +memchr = { version = "2.4.1", features = ["std", "use_std"] } +native-tls = { version = "0.2.11", default-features = false, features = ["alpn"] } +nix = { version = "0.26.1", features = ["acct", "aio", "dir", "env", "event", "feature", "fs", "hostname", "inotify", "ioctl", "kmod", "memoffset", "mman", "mount", "mqueue", "net", "personality", "pin-utils", "poll", "process", "pthread", "ptrace", "quota", "reboot", "resource", "sched", "signal", "socket", "term", "time", "ucontext", "uio", "user", "zerocopy"] } +nom = { version = "7.1.0", features = ["alloc", "std"] } +num-bigint = { version = "0.4.2", features = ["std"] } +num-integer = { version = "0.1.44", features = ["i128", "std"] } +num-traits = { version = "0.2.15", features = ["i128", "libm", "std"] } +openssl = { version = "0.10.43", features = ["vendored"] } +openssl-sys = { version = "0.9.79", default-features = false, features = ["openssl-src", "vendored"] } +ordered-float = { version = "3.4.0", features = ["serde", "std"] } +parking_lot = { version = "0.12.0", features = ["send_guard"] } +phf = { version = "0.11.1", features = ["std", "uncased"] } +phf_shared = { version = "0.11.1", features = ["std", "uncased"] } +postgres = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4"] } +postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["chrono-04", "serde-1", "serde_json-1", "uuid-1", "with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] } +proc-macro2 = { version = "1.0.47", features = ["proc-macro", "span-locations"] } +prometheus = { version = "0.13.3", default-features = false, features = ["libc", "process", "procfs"] } +prost = { version = "0.11.3", features = ["no-recursion-limit", "prost-derive", "std"] } +prost-reflect = { version = "0.9.2", default-features = false, features = ["base64", "serde", "serde-value", "serde1"] } +prost-types = { version = "0.11.2", features = ["std"] } +quote = { version = "1.0.21", features = ["proc-macro"] } +rand = { version = "0.8.5", features = ["alloc", "getrandom", "libc", "rand_chacha", "small_rng", "std", "std_rng"] } +rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka.git", features = ["cmake", "cmake-build", "libz", "libz-static", "libz-sys", "openssl-sys", "ssl", "ssl-vendored", "zstd", "zstd-sys"] } +regex = { version = "1.7.0", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +regex-syntax = { version = "0.6.28", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +reqwest = { version = "0.11.13", features = ["__tls", "blocking", "default-tls", "hyper-tls", "json", "native-tls", "native-tls-crate", "native-tls-vendored", "serde_json", "tokio-native-tls"] } +ring = { version = "0.16.20", features = ["alloc", "dev_urandom_fallback", "once_cell", "std"] } +schemars = { version = "0.8.11", features = ["derive", "schemars_derive", "uuid1"] } +scopeguard = { version = "1.1.0", features = ["use_std"] } +semver = { version = "1.0.14", features = ["serde", "std"] } +serde = { version = "1.0.147", features = ["alloc", "derive", "serde_derive", "std"] } +serde_json = { version = "1.0.89", features = ["alloc", "arbitrary_precision", "float_roundtrip", "indexmap", "preserve_order", "raw_value", "std"] } +sha2 = { version = "0.10.6", features = ["std"] } +smallvec = { version = "1.10.0", default-features = false, features = ["serde", "union", "write"] } +socket2 = { version = "0.4.7", default-features = false, features = ["all"] } +syn = { version = "1.0.103", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] } +textwrap = { version = "0.15.0", default-features = false, features = ["terminal_size"] } +time = { version = "0.3.17", features = ["alloc", "formatting", "macros", "parsing", "quickcheck", "serde", "serde-well-known", "std"] } +timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode", "getopts", "getopts-dep"] } +timely_communication = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode", "getopts"] } +tokio = { version = "1.23.0", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "test-util", "time", "tokio-macros", "tracing"] } +tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["runtime", "serde", "with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] } +tokio-stream = { version = "0.1.11", features = ["net", "sync", "time", "tokio-util"] } +tokio-util = { version = "0.7.4", features = ["codec", "compat", "futures-io", "io", "slab", "time", "tracing"] } +tower = { version = "0.4.13", features = ["__common", "balance", "buffer", "discover", "filter", "futures-core", "futures-util", "indexmap", "limit", "load", "log", "make", "pin-project", "pin-project-lite", "rand", "ready-cache", "retry", "slab", "timeout", "tokio", "tokio-util", "tracing", "util"] } +tower-http = { version = "0.3.4", features = ["auth", "base64", "cors", "map-response-body", "tower", "trace", "tracing", "util"] } +tracing = { version = "0.1.37", features = ["attributes", "log", "std", "tracing-attributes"] } +tracing-core = { version = "0.1.30", features = ["once_cell", "std"] } +tracing-subscriber = { version = "0.3.16", features = ["alloc", "ansi", "env-filter", "fmt", "json", "matchers", "nu-ansi-term", "once_cell", "regex", "registry", "serde", "serde_json", "sharded-slab", "smallvec", "std", "thread_local", "tracing", "tracing-log", "tracing-serde"] } +uncased = { version = "0.9.7", features = ["alloc"] } +url = { version = "2.3.1", features = ["serde"] } +uuid = { version = "1.2.2", features = ["getrandom", "rng", "serde", "std", "v4"] } +zeroize = { version = "1.5.7", features = ["alloc", "serde"] } + +[build-dependencies] +anyhow = { version = "1.0.66", features = ["backtrace", "std"] } +aws-sdk-sts = { version = "0.21.0", default-features = false, features = ["native-tls", "rt-tokio"] } +aws-sig-auth = { version = "0.51.0", default-features = false, features = ["aws-smithy-eventstream", "sign-eventstream"] } +aws-sigv4 = { version = "0.51.0", features = ["aws-smithy-eventstream", "bytes", "form_urlencoded", "http", "percent-encoding", "sign-eventstream", "sign-http"] } +aws-smithy-http = { version = "0.51.0", default-features = false, features = ["aws-smithy-eventstream", "event-stream", "rt-tokio", "tokio", "tokio-util"] } +aws-types = { version = "0.51.0", default-features = false, features = ["hardcoded-credentials"] } +axum = { version = "0.5.17", features = ["form", "headers", "http1", "json", "matched-path", "original-uri", "query", "serde_json", "serde_urlencoded", "tower-log"] } +base64 = { version = "0.13.1", features = ["alloc", "std"] } +bstr = { version = "0.2.14", features = ["lazy_static", "regex-automata", "serde", "serde1", "serde1-nostd", "std", "unicode"] } +byteorder = { version = "1.4.3", features = ["std"] } +bytes = { version = "1.3.0", features = ["std"] } +cc = { version = "1.0.77", default-features = false, features = ["jobserver", "parallel"] } +chrono = { version = "0.4.23", default-features = false, features = ["alloc", "clock", "iana-time-zone", "serde", "std", "winapi"] } +clap = { version = "3.2.20", features = ["atty", "clap_derive", "color", "derive", "env", "once_cell", "std", "strsim", "suggestions", "termcolor", "terminal_size", "wrap_help"] } +criterion = { version = "0.4.0", features = ["async", "async_tokio", "cargo_bench_support", "futures", "html_reports", "plotters", "rayon", "tokio"] } +crossbeam-channel = { version = "0.5.6", features = ["crossbeam-utils", "std"] } +crossbeam-deque = { version = "0.8.1", features = ["crossbeam-epoch", "crossbeam-utils", "std"] } +crossbeam-epoch = { version = "0.9.13", features = ["alloc", "std"] } +crossbeam-utils = { version = "0.8.7", features = ["lazy_static", "std"] } +crypto-common = { version = "0.1.3", default-features = false, features = ["std"] } +dec = { version = "0.4.8", default-features = false, features = ["serde"] } +digest = { version = "0.10.6", features = ["alloc", "block-buffer", "core-api", "mac", "std", "subtle"] } +either = { version = "1.8.0", features = ["use_std"] } +flate2 = { version = "1.0.24", features = ["any_zlib", "libz-sys", "miniz_oxide", "rust_backend", "zlib"] } +frunk_core = { version = "0.4.0", default-features = false, features = ["std"] } +futures = { version = "0.3.25", features = ["alloc", "async-await", "executor", "futures-executor", "std"] } +futures-channel = { version = "0.3.25", features = ["alloc", "futures-sink", "sink", "std"] } +futures-core = { version = "0.3.25", features = ["alloc", "std"] } +futures-executor = { version = "0.3.25", features = ["std"] } +futures-io = { version = "0.3.25", features = ["std"] } +futures-sink = { version = "0.3.25", features = ["alloc", "std"] } +futures-task = { version = "0.3.25", features = ["alloc", "std"] } +futures-util = { version = "0.3.25", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "sink", "slab", "std"] } +globset = { version = "0.4.9", features = ["log", "serde", "serde1"] } +hashbrown = { git = "https://github.com/MaterializeInc/hashbrown.git", features = ["ahash", "inline-more", "raw"] } +hyper = { version = "0.14.23", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] } +indexmap = { version = "1.9.1", default-features = false, features = ["std"] } +k8s-openapi = { version = "0.16.0", features = ["api", "http", "percent-encoding", "url", "v1_22"] } +kube = { version = "0.76.0", features = ["client", "config", "derive", "kube-client", "kube-derive", "kube-runtime", "openssl-tls", "runtime", "ws"] } +kube-client = { version = "0.76.0", default-features = false, features = ["__non_core", "base64", "bytes", "chrono", "client", "config", "dirs", "either", "futures", "http-body", "hyper", "hyper-openssl", "hyper-timeout", "jsonpatch", "jsonpath_lib", "openssl", "openssl-tls", "pem", "pin-project", "rand", "serde_yaml", "tokio", "tokio-tungstenite", "tokio-util", "tower", "tower-http", "tracing", "ws"] } +kube-core = { version = "0.76.0", default-features = false, features = ["json-patch", "jsonpatch", "schema", "schemars", "ws"] } +libc = { version = "0.2.137", features = ["extra_traits", "std"] } +log = { version = "0.4.17", default-features = false, features = ["std"] } +lru = { version = "0.8.1", features = ["hashbrown"] } +memchr = { version = "2.4.1", features = ["std", "use_std"] } +native-tls = { version = "0.2.11", default-features = false, features = ["alpn"] } +nix = { version = "0.26.1", features = ["acct", "aio", "dir", "env", "event", "feature", "fs", "hostname", "inotify", "ioctl", "kmod", "memoffset", "mman", "mount", "mqueue", "net", "personality", "pin-utils", "poll", "process", "pthread", "ptrace", "quota", "reboot", "resource", "sched", "signal", "socket", "term", "time", "ucontext", "uio", "user", "zerocopy"] } +nom = { version = "7.1.0", features = ["alloc", "std"] } +num-bigint = { version = "0.4.2", features = ["std"] } +num-integer = { version = "0.1.44", features = ["i128", "std"] } +num-traits = { version = "0.2.15", features = ["i128", "libm", "std"] } +openssl = { version = "0.10.43", features = ["vendored"] } +openssl-sys = { version = "0.9.79", default-features = false, features = ["openssl-src", "vendored"] } +ordered-float = { version = "3.4.0", features = ["serde", "std"] } +parking_lot = { version = "0.12.0", features = ["send_guard"] } +phf = { version = "0.11.1", features = ["std", "uncased"] } +phf_shared = { version = "0.11.1", features = ["std", "uncased"] } +postgres = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4"] } +postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["chrono-04", "serde-1", "serde_json-1", "uuid-1", "with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] } +proc-macro2 = { version = "1.0.47", features = ["proc-macro", "span-locations"] } +prometheus = { version = "0.13.3", default-features = false, features = ["libc", "process", "procfs"] } +prost = { version = "0.11.3", features = ["no-recursion-limit", "prost-derive", "std"] } +prost-reflect = { version = "0.9.2", default-features = false, features = ["base64", "serde", "serde-value", "serde1"] } +prost-types = { version = "0.11.2", features = ["std"] } +quote = { version = "1.0.21", features = ["proc-macro"] } +rand = { version = "0.8.5", features = ["alloc", "getrandom", "libc", "rand_chacha", "small_rng", "std", "std_rng"] } +rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka.git", features = ["cmake", "cmake-build", "libz", "libz-static", "libz-sys", "openssl-sys", "ssl", "ssl-vendored", "zstd", "zstd-sys"] } +regex = { version = "1.7.0", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +regex-syntax = { version = "0.6.28", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] } +reqwest = { version = "0.11.13", features = ["__tls", "blocking", "default-tls", "hyper-tls", "json", "native-tls", "native-tls-crate", "native-tls-vendored", "serde_json", "tokio-native-tls"] } +ring = { version = "0.16.20", features = ["alloc", "dev_urandom_fallback", "once_cell", "std"] } +schemars = { version = "0.8.11", features = ["derive", "schemars_derive", "uuid1"] } +scopeguard = { version = "1.1.0", features = ["use_std"] } +semver = { version = "1.0.14", features = ["serde", "std"] } +serde = { version = "1.0.147", features = ["alloc", "derive", "serde_derive", "std"] } +serde_json = { version = "1.0.89", features = ["alloc", "arbitrary_precision", "float_roundtrip", "indexmap", "preserve_order", "raw_value", "std"] } +sha2 = { version = "0.10.6", features = ["std"] } +smallvec = { version = "1.10.0", default-features = false, features = ["serde", "union", "write"] } +socket2 = { version = "0.4.7", default-features = false, features = ["all"] } +syn = { version = "1.0.103", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] } +textwrap = { version = "0.15.0", default-features = false, features = ["terminal_size"] } +time = { version = "0.3.17", features = ["alloc", "formatting", "macros", "parsing", "quickcheck", "serde", "serde-well-known", "std"] } +time-macros = { version = "0.2.6", default-features = false, features = ["formatting", "parsing", "serde"] } +timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode", "getopts", "getopts-dep"] } +timely_communication = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false, features = ["bincode", "getopts"] } +tokio = { version = "1.23.0", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "test-util", "time", "tokio-macros", "tracing"] } +tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres", features = ["runtime", "serde", "with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] } +tokio-stream = { version = "0.1.11", features = ["net", "sync", "time", "tokio-util"] } +tokio-util = { version = "0.7.4", features = ["codec", "compat", "futures-io", "io", "slab", "time", "tracing"] } +tower = { version = "0.4.13", features = ["__common", "balance", "buffer", "discover", "filter", "futures-core", "futures-util", "indexmap", "limit", "load", "log", "make", "pin-project", "pin-project-lite", "rand", "ready-cache", "retry", "slab", "timeout", "tokio", "tokio-util", "tracing", "util"] } +tower-http = { version = "0.3.4", features = ["auth", "base64", "cors", "map-response-body", "tower", "trace", "tracing", "util"] } +tracing = { version = "0.1.37", features = ["attributes", "log", "std", "tracing-attributes"] } +tracing-core = { version = "0.1.30", features = ["once_cell", "std"] } +tracing-subscriber = { version = "0.3.16", features = ["alloc", "ansi", "env-filter", "fmt", "json", "matchers", "nu-ansi-term", "once_cell", "regex", "registry", "serde", "serde_json", "sharded-slab", "smallvec", "std", "thread_local", "tracing", "tracing-log", "tracing-serde"] } +uncased = { version = "0.9.7", features = ["alloc"] } +url = { version = "2.3.1", features = ["serde"] } +uuid = { version = "1.2.2", features = ["getrandom", "rng", "serde", "std", "v4"] } +zeroize = { version = "1.5.7", features = ["alloc", "serde"] } + +[target.x86_64-unknown-linux-gnu.dependencies] +byteorder = { version = "1.4.3", default-features = false, features = ["i128"] } +libc = { version = "0.2.137", default-features = false, features = ["use_std"] } +native-tls = { version = "0.2.11", default-features = false, features = ["vendored"] } +once_cell = { version = "1.16.0", features = ["alloc", "race", "std", "unstable"] } +tikv-jemalloc-sys = { version = "0.4.2+5.2.1-patched.2", features = ["background_threads", "background_threads_runtime_support", "profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } + +[target.x86_64-unknown-linux-gnu.build-dependencies] +byteorder = { version = "1.4.3", default-features = false, features = ["i128"] } +libc = { version = "0.2.137", default-features = false, features = ["use_std"] } +native-tls = { version = "0.2.11", default-features = false, features = ["vendored"] } +once_cell = { version = "1.16.0", features = ["alloc", "race", "std", "unstable"] } +tikv-jemalloc-sys = { version = "0.4.2+5.2.1-patched.2", features = ["background_threads", "background_threads_runtime_support", "profiling", "stats", "unprefixed_malloc_on_supported_platforms"] } + +[target.x86_64-apple-darwin.dependencies] +native-tls = { version = "0.2.11", default-features = false, features = ["vendored"] } +once_cell = { version = "1.16.0", features = ["alloc", "race", "std", "unstable"] } +security-framework = { version = "2.0.0", features = ["OSX_10_9", "alpn"] } + +[target.x86_64-apple-darwin.build-dependencies] +native-tls = { version = "0.2.11", default-features = false, features = ["vendored"] } +once_cell = { version = "1.16.0", features = ["alloc", "race", "std", "unstable"] } +security-framework = { version = "2.0.0", features = ["OSX_10_9", "alpn"] } + +### END HAKARI SECTION diff --git a/src/workspace-hack/build.rs b/src/workspace-hack/build.rs new file mode 100644 index 000000000000..ecaef0c7c4b2 --- /dev/null +++ b/src/workspace-hack/build.rs @@ -0,0 +1,12 @@ +// Copyright Materialize, Inc. and contributors. All rights reserved. +// +// Use of this software is governed by the Business Source License +// included in the LICENSE file. +// +// As of the Change Date specified in that file, in accordance with +// the Business Source License, use of this software will be governed +// by the Apache License, Version 2.0. + +// A build script is required for Cargo to honor build dependencies. + +fn main() {} diff --git a/src/workspace-hack/src/lib.rs b/src/workspace-hack/src/lib.rs new file mode 100644 index 000000000000..656c789d9913 --- /dev/null +++ b/src/workspace-hack/src/lib.rs @@ -0,0 +1,8 @@ +// Copyright Materialize, Inc. and contributors. All rights reserved. +// +// Use of this software is governed by the Business Source License +// included in the LICENSE file. +// +// As of the Change Date specified in that file, in accordance with +// the Business Source License, use of this software will be governed +// by the Apache License, Version 2.0. diff --git a/test/metabase/smoketest/Cargo.toml b/test/metabase/smoketest/Cargo.toml index 5c0b0297f31f..5e9369693758 100644 --- a/test/metabase/smoketest/Cargo.toml +++ b/test/metabase/smoketest/Cargo.toml @@ -14,3 +14,4 @@ mz-ore = { path = "../../../src/ore", features = ["network", "async", "test"] } tokio = { version = "1.23.0", features = ["macros"] } tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.37" +workspace-hack = { version = "0.0.0", path = "../../../src/workspace-hack" } diff --git a/test/perf-kinesis/Cargo.toml b/test/perf-kinesis/Cargo.toml index 8cf9b5398c6d..0ce0141e1fd9 100644 --- a/test/perf-kinesis/Cargo.toml +++ b/test/perf-kinesis/Cargo.toml @@ -22,3 +22,4 @@ tokio = "1.23.0" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.37" tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } +workspace-hack = { version = "0.0.0", path = "../../src/workspace-hack" } diff --git a/test/test-util/Cargo.toml b/test/test-util/Cargo.toml index 39ea509b969e..0c61d94b7bbe 100644 --- a/test/test-util/Cargo.toml +++ b/test/test-util/Cargo.toml @@ -16,3 +16,4 @@ rdkafka = { git = "https://github.com/MaterializeInc/rust-rdkafka.git", features tokio = "1.23.0" tokio-postgres = { git = "https://github.com/MaterializeInc/rust-postgres" } tracing = "0.1.37" +workspace-hack = { version = "0.0.0", path = "../../src/workspace-hack" }