diff --git a/Cargo.lock b/Cargo.lock index 25b3b0da23a82..ec608dd0e3595 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -398,9 +398,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", diff --git a/src/adapter/Cargo.toml b/src/adapter/Cargo.toml index f8a308fba37e5..3543a1cad59a4 100644 --- a/src/adapter/Cargo.toml +++ b/src/adapter/Cargo.toml @@ -12,7 +12,7 @@ workspace = true [dependencies] anyhow = "1.0.66" arrow = { version = "53.3.0", default-features = false } -async-trait = "0.1.68" +async-trait = "0.1.83" bytes = "1.3.0" bytesize = "1.1.0" chrono = { version = "0.4.35", default-features = false, features = ["std"] } diff --git a/src/aws-secrets-controller/Cargo.toml b/src/aws-secrets-controller/Cargo.toml index 0e06a1f96f292..6356c95cc2b71 100644 --- a/src/aws-secrets-controller/Cargo.toml +++ b/src/aws-secrets-controller/Cargo.toml @@ -14,7 +14,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" aws-config = { version = "1.2.0", default-features = false } aws-credential-types = { version = "1.1.1", features = ["hardcoded-credentials"] } aws-sdk-secretsmanager = { version = "1.20.0", default-features = false, features = ["rt-tokio"] } diff --git a/src/balancerd/Cargo.toml b/src/balancerd/Cargo.toml index 7ff03e57fcc42..fd9ef46da797d 100644 --- a/src/balancerd/Cargo.toml +++ b/src/balancerd/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = { version = "1.0.66", features = ["backtrace"] } -async-trait = "0.1.68" +async-trait = "0.1.83" axum = "0.7.5" bytes = "1.3.0" bytesize = "1.1.0" diff --git a/src/catalog/Cargo.toml b/src/catalog/Cargo.toml index 256c26e1b361c..9f0e9e97de330 100644 --- a/src/catalog/Cargo.toml +++ b/src/catalog/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" bincode = { version = "1.3.3" } bytes = { version = "1.3.0", features = ["serde"] } bytesize = "1.1.0" diff --git a/src/cloud-resources/Cargo.toml b/src/cloud-resources/Cargo.toml index ffdb1cd8c5e5c..ec228f36e33c6 100644 --- a/src/cloud-resources/Cargo.toml +++ b/src/cloud-resources/Cargo.toml @@ -25,7 +25,7 @@ tracing = "0.1.37" uuid = { version = "1.2", features = ["serde", "v4"] } workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true } -async-trait = { version = "0.1.68", optional = true } +async-trait = { version = "0.1.83", optional = true } mz-repr = { path = "../repr", optional = true } [features] diff --git a/src/cluster-client/Cargo.toml b/src/cluster-client/Cargo.toml index a450931a8b9d6..5f6e4e2ac8e41 100644 --- a/src/cluster-client/Cargo.toml +++ b/src/cluster-client/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" chrono = { version = "0.4.35", default-features = false, features = ["std"] } futures = "0.3.25" http = "1.1.0" diff --git a/src/cluster/Cargo.toml b/src/cluster/Cargo.toml index 9bf674bc2dbf8..ecfb6196a6e7c 100644 --- a/src/cluster/Cargo.toml +++ b/src/cluster/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" bytesize = "1.1.0" clap = { version = "3.2.24", features = ["derive", "env"] } crossbeam-channel = "0.5.8" diff --git a/src/compute-client/Cargo.toml b/src/compute-client/Cargo.toml index 692c30122870b..2399073e4759a 100644 --- a/src/compute-client/Cargo.toml +++ b/src/compute-client/Cargo.toml @@ -12,7 +12,7 @@ workspace = true [dependencies] anyhow = "1.0.66" async-stream = "0.3.3" -async-trait = "0.1.68" +async-trait = "0.1.83" bytes = "1.3.0" bytesize = "1.1.0" chrono = { version = "0.4.35", default-features = false, features = ["std"] } diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml index 834a235891513..f072cdffa6dfb 100644 --- a/src/compute/Cargo.toml +++ b/src/compute/Cargo.toml @@ -12,7 +12,7 @@ workspace = true [dependencies] anyhow = "1.0.66" async-stream = "0.3.3" -async-trait = "0.1.68" +async-trait = "0.1.83" bytesize = "1.1.0" clap = { version = "3.2.24", features = ["derive", "env"] } crossbeam-channel = "0.5.8" diff --git a/src/durable-cache/Cargo.toml b/src/durable-cache/Cargo.toml index e3668e1d3baf5..dcfce2bacda9c 100644 --- a/src/durable-cache/Cargo.toml +++ b/src/durable-cache/Cargo.toml @@ -10,7 +10,7 @@ publish = false workspace = true [dependencies] -async-trait = "0.1.68" +async-trait = "0.1.83" bytes = { version = "1.3.0" } differential-dataflow = "0.13.2" futures = "0.3.25" diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index 0ad4954b34343..04c56939b71dc 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -14,7 +14,7 @@ workspace = true [dependencies] anyhow = "1.0.66" askama = { version = "0.12.1", default-features = false, features = ["config", "serde-json"] } -async-trait = "0.1.68" +async-trait = "0.1.83" axum = { version = "0.7.5", features = ["ws"] } axum-extra = { version = "0.9.3", features = ["typed-header"] } base64 = "0.13.1" diff --git a/src/orchestrator-kubernetes/Cargo.toml b/src/orchestrator-kubernetes/Cargo.toml index d5f12e153dabc..b9eb00abb45c3 100644 --- a/src/orchestrator-kubernetes/Cargo.toml +++ b/src/orchestrator-kubernetes/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" chrono = { version = "0.4.35", default-features = false } clap = { version = "3.2.24", features = ["derive"] } fail = { version = "0.5.1", features = ["failpoints"] } diff --git a/src/orchestrator-process/Cargo.toml b/src/orchestrator-process/Cargo.toml index 9267e0b0ddb67..066b33c09f4b0 100644 --- a/src/orchestrator-process/Cargo.toml +++ b/src/orchestrator-process/Cargo.toml @@ -12,7 +12,7 @@ workspace = true [dependencies] anyhow = "1.0.66" async-stream = "0.3.3" -async-trait = "0.1.68" +async-trait = "0.1.83" chrono = { version = "0.4.35", default-features = false, features = ["clock"] } futures = "0.3.25" hex = "0.4.3" diff --git a/src/orchestrator-tracing/Cargo.toml b/src/orchestrator-tracing/Cargo.toml index b800b0ed83d34..b395acd1fd2fb 100644 --- a/src/orchestrator-tracing/Cargo.toml +++ b/src/orchestrator-tracing/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" clap = { version = "3.2.24", features = ["env", "derive"] } derivative = "2.2.0" futures-core = "0.3.21" diff --git a/src/orchestrator/Cargo.toml b/src/orchestrator/Cargo.toml index 405e68265a40a..8316e1a6a32e8 100644 --- a/src/orchestrator/Cargo.toml +++ b/src/orchestrator/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" bytesize = "1.1.0" chrono = { version = "0.4.35", default-features = false, features = ["serde"] } derivative = "2.2.0" diff --git a/src/orchestratord/Cargo.toml b/src/orchestratord/Cargo.toml index 9dd52b83db41f..c9fc869aa4262 100644 --- a/src/orchestratord/Cargo.toml +++ b/src/orchestratord/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" axum = "0.7.5" chrono = { version = "0.4.35", default-features = false } clap = { version = "3.2.24", features = ["derive"] } diff --git a/src/ore/Cargo.toml b/src/ore/Cargo.toml index 9a8847346daa3..98789d223ce68 100644 --- a/src/ore/Cargo.toml +++ b/src/ore/Cargo.toml @@ -18,7 +18,7 @@ anyhow = { version = "1.0.66", optional = true } # # The only exception to the above is the `either` crate, which itself has zero # dependencies and is widely considered to be basically part of the stdlib. -async-trait = { version = "0.1.68", optional = true } +async-trait = { version = "0.1.83", optional = true } bytes = { version = "1.3.0", optional = true } chrono = { version = "0.4.35", default-features = false, features = [ "std", diff --git a/src/persist-cli/Cargo.toml b/src/persist-cli/Cargo.toml index 38b63c48d69ad..3caa136a046dd 100644 --- a/src/persist-cli/Cargo.toml +++ b/src/persist-cli/Cargo.toml @@ -19,7 +19,7 @@ bench = false [dependencies] anyhow = { version = "1.0.66", features = ["backtrace"] } arrow = { version = "53.3.0", default-features = false } -async-trait = "0.1.68" +async-trait = "0.1.83" axum = "0.7.5" bytes = { version = "1.3.0", features = ["serde"] } clap = { version = "3.2.24", features = ["derive", "env"] } diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml index 4ea313585f6ae..12f089aa00b55 100644 --- a/src/persist-client/Cargo.toml +++ b/src/persist-client/Cargo.toml @@ -32,7 +32,7 @@ anyhow = { version = "1.0.66", features = ["backtrace"] } arrayvec = "0.7.4" arrow = { version = "53.3.0", default-features = false } async-stream = "0.3.3" -async-trait = "0.1.68" +async-trait = "0.1.83" bytes = { version = "1.3.0", features = ["serde"] } clap = { version = "3.2.24", features = ["derive"] } differential-dataflow = "0.13.2" diff --git a/src/persist/Cargo.toml b/src/persist/Cargo.toml index 7b5ceca4686c0..7a596cdbfb80f 100644 --- a/src/persist/Cargo.toml +++ b/src/persist/Cargo.toml @@ -24,7 +24,7 @@ bench = false [dependencies] anyhow = { version = "1.0.66", features = ["backtrace"] } arrow = { version = "53.3.0", default-features = false } -async-trait = "0.1.68" +async-trait = "0.1.83" async-stream = "0.3.3" aws-config = { version = "1.2.0", default-features = false } aws-credential-types = { version = "1.1.1", features = ["hardcoded-credentials"] } diff --git a/src/pgwire-common/Cargo.toml b/src/pgwire-common/Cargo.toml index 3a16019752670..2af62727743bf 100644 --- a/src/pgwire-common/Cargo.toml +++ b/src/pgwire-common/Cargo.toml @@ -11,7 +11,7 @@ publish = false workspace = true [dependencies] -async-trait = "0.1.68" +async-trait = "0.1.83" byteorder = "1.4.3" bytes = "1.3.0" bytesize = "1.1.0" diff --git a/src/pgwire/Cargo.toml b/src/pgwire/Cargo.toml index 94ea1a5721d94..a5608b3d503b4 100644 --- a/src/pgwire/Cargo.toml +++ b/src/pgwire/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" byteorder = "1.4.3" bytes = "1.3.0" bytesize = "1.1.0" diff --git a/src/secrets/Cargo.toml b/src/secrets/Cargo.toml index 92fd224a869e6..fbd76ff185726 100644 --- a/src/secrets/Cargo.toml +++ b/src/secrets/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" mz-repr = { path = "../repr" } tracing = "0.1.37" workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true } diff --git a/src/server-core/Cargo.toml b/src/server-core/Cargo.toml index 739369586abce..5b2f459c7aa09 100644 --- a/src/server-core/Cargo.toml +++ b/src/server-core/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = { version = "0.1.68" } +async-trait = { version = "0.1.83" } clap = { version = "3.2.24", features = ["derive", "env"] } openssl = { version = "0.10.48", features = ["vendored"] } scopeguard = "1.1.0" diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index 1825a8b440d0b..2aec4f043cbc0 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -12,7 +12,7 @@ workspace = true [dependencies] anyhow = "1.0.66" async-stream = "0.3.3" -async-trait = "0.1.68" +async-trait = "0.1.83" clap = { version = "3.2.24", features = ["env", "derive"] } crossbeam-channel = "0.5.8" futures = "0.3.25" diff --git a/src/storage-client/Cargo.toml b/src/storage-client/Cargo.toml index cff8ff1d65447..33aa35bbf2f98 100644 --- a/src/storage-client/Cargo.toml +++ b/src/storage-client/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" chrono = { version = "0.4.35", default-features = false, features = ["std"] } differential-dataflow = "0.13.2" futures = "0.3.25" diff --git a/src/storage-controller/Cargo.toml b/src/storage-controller/Cargo.toml index 8f85997d3a28b..53464bbd3b0b1 100644 --- a/src/storage-controller/Cargo.toml +++ b/src/storage-controller/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" bytes = "1.3.0" chrono = { version = "0.4.35", default-features = false, features = ["std"] } derivative = "2.2.0" diff --git a/src/storage-types/Cargo.toml b/src/storage-types/Cargo.toml index f9b5343856943..722ceb63d81c7 100644 --- a/src/storage-types/Cargo.toml +++ b/src/storage-types/Cargo.toml @@ -16,7 +16,7 @@ harness = false [dependencies] anyhow = "1.0.66" arrow = { version = "53.3.0", default-features = false } -async-trait = "0.1.68" +async-trait = "0.1.83" aws-config = { version = "1.2.0", default-features = false, features = ["sso"] } aws-credential-types = { version = "1.1.1", features = ["hardcoded-credentials"] } aws-sdk-sts = { version = "1.7.0", default-features = false, features = ["rt-tokio"] } diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index 324a72c575086..b090f3dcf4e38 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -16,7 +16,7 @@ bench = false [dependencies] anyhow = "1.0.66" async-stream = "0.3.3" -async-trait = "0.1.68" +async-trait = "0.1.83" bytes = { version = "1.3.0", features = ["serde"] } bytesize = "1.1.0" bincode = "1" @@ -102,7 +102,7 @@ mz-build-tools = { path = "../build-tools", default-features = false } tonic-build = "0.12.1" [dev-dependencies] -async-trait = "0.1.68" +async-trait = "0.1.83" axum = "0.7.5" clap = { version = "3.2.24", features = ["derive", "env"] } datadriven = { version = "0.8.0", features = ["async"] } diff --git a/src/testdrive/Cargo.toml b/src/testdrive/Cargo.toml index 8214a19102b14..8b5099a9fa50e 100644 --- a/src/testdrive/Cargo.toml +++ b/src/testdrive/Cargo.toml @@ -12,7 +12,7 @@ workspace = true [dependencies] anyhow = "1.0.66" async-compression = { version = "0.4.5", features = ["tokio", "gzip"] } -async-trait = "0.1.68" +async-trait = "0.1.83" aws-config = { version = "1.2.0", default-features = false } aws-credential-types = { version = "1.1.1", features = ["hardcoded-credentials"] } aws-sdk-sts = { version = "1.7.0", default-features = false, features = ["rt-tokio"] } diff --git a/src/timestamp-oracle/Cargo.toml b/src/timestamp-oracle/Cargo.toml index 08315720dda24..c00ef13ef9a15 100644 --- a/src/timestamp-oracle/Cargo.toml +++ b/src/timestamp-oracle/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.66" -async-trait = "0.1.68" +async-trait = "0.1.83" dec = "0.4.8" deadpool-postgres = "0.10.3" futures = "0.3.25" diff --git a/src/txn-wal/Cargo.toml b/src/txn-wal/Cargo.toml index d01d0d3118e96..45ae591554a0e 100644 --- a/src/txn-wal/Cargo.toml +++ b/src/txn-wal/Cargo.toml @@ -10,7 +10,7 @@ publish = false workspace = true [dependencies] -async-trait = "0.1.68" +async-trait = "0.1.83" bytes = { version = "1.3.0" } differential-dataflow = "0.13.2" futures = "0.3.25" diff --git a/test/sqllogictest/sqlite b/test/sqllogictest/sqlite index 11e43fd53e51c..262d86a2a2073 160000 --- a/test/sqllogictest/sqlite +++ b/test/sqllogictest/sqlite @@ -1 +1 @@ -Subproject commit 11e43fd53e51c95fe26310157f737e8e0e8e57d1 +Subproject commit 262d86a2a2073c7a707beaa34be283d3b0ead301