Skip to content

Commit

Permalink
Move futures and pin-project to workspace deps
Browse files Browse the repository at this point in the history
  • Loading branch information
aqrln committed Oct 24, 2024
1 parent cc01249 commit eef973b
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 20 deletions.
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ members = [
[workspace.dependencies]
async-trait = { version = "0.1.77" }
enumflags2 = { version = "0.7", features = ["serde"] }
futures = "0.3"
psl = { path = "./psl/psl" }
serde_json = { version = "1", features = ["float_roundtrip", "preserve_order", "raw_value"] }
serde = { version = "1", features = ["derive"] }
Expand Down Expand Up @@ -66,6 +67,7 @@ napi = { version = "2.15.1", default-features = false, features = [
napi-derive = "2.15.0"
metrics = "0.23.0"
js-sys = { version = "0.3" }
pin-project = "1"
rand = { version = "0.8" }
regex = { version = "1", features = ["std"] }
serde_repr = { version = "0.1.17" }
Expand Down
4 changes: 2 additions & 2 deletions libs/crosstarget-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ edition = "2021"
[dependencies]
derive_more.workspace = true
enumflags2.workspace = true
futures = "0.3"
futures.workspace = true

[target.'cfg(target_arch = "wasm32")'.dependencies]
js-sys.workspace = true
wasm-bindgen.workspace = true
wasm-bindgen-futures.workspace = true
tokio = { version = "1", features = ["macros", "sync"] }
pin-project = "1"
pin-project.workspace = true

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion quaint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ async-trait.workspace = true
thiserror = "1.0"
num_cpus = "1.12"
metrics.workspace = true
futures = "0.3"
futures.workspace = true
url.workspace = true
hex = "0.4"
itertools.workspace = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ user-facing-errors.workspace = true
prisma-value = { path = "../../../libs/prisma-value" }
query-engine-metrics = { path = "../../metrics"}
once_cell = "1.15.0"
futures = "0.3"
futures.workspace = true
paste = "1.0.14"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion query-engine/connectors/mongodb-query-connector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version = "0.1.0"
anyhow = "1.0"
async-trait.workspace = true
bigdecimal = "0.3"
futures = "0.3"
futures.workspace = true
itertools.workspace = true
mongodb.workspace = true
bson.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion query-engine/connectors/query-connector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version = "0.1.0"
anyhow = "1.0"
async-trait.workspace = true
chrono.workspace = true
futures = "0.3"
futures.workspace = true
itertools.workspace = true
query-structure = {path = "../../query-structure"}
prisma-value = {path = "../../../libs/prisma-value"}
Expand Down
2 changes: 1 addition & 1 deletion query-engine/connectors/sql-query-connector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ psl.workspace = true
anyhow = "1.0"
async-trait.workspace = true
bigdecimal = "0.3"
futures = "0.3"
futures.workspace = true
itertools.workspace = true
once_cell = "1.3"
rand.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion query-engine/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ connection-string.workspace = true
connector = { path = "../connectors/query-connector", package = "query-connector" }
crossbeam-channel = "0.5.6"
psl.workspace = true
futures = "0.3"
futures.workspace = true
indexmap.workspace = true
itertools.workspace = true
once_cell = "1"
Expand Down
5 changes: 2 additions & 3 deletions query-engine/driver-adapters/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,17 @@ postgresql = ["quaint/postgresql"]

[dependencies]
async-trait.workspace = true
futures.workspace = true
once_cell = "1.15"
serde.workspace = true
serde_json.workspace = true
tracing.workspace = true
tracing-core = "0.1"
metrics.workspace = true
uuid.workspace = true
pin-project = "1"
pin-project.workspace = true
serde_repr.workspace = true

futures = "0.3"

[dev-dependencies]
expect-test = "1"
tokio = { version = "1", features = ["macros", "time", "sync"] }
Expand Down
4 changes: 2 additions & 2 deletions query-engine/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
futures = "0.3"
futures.workspace = true
derive_more.workspace = true
metrics.workspace = true
metrics-util = "0.17.0"
Expand All @@ -16,7 +16,7 @@ tracing.workspace = true
tracing-futures = "0.2"
tracing-subscriber = "0.3.11"
parking_lot = "0.12"
pin-project = "1"
pin-project.workspace = true

[dev-dependencies]
expect-test = "1"
Expand Down
2 changes: 1 addition & 1 deletion query-engine/query-engine-c-abi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ tracing-opentelemetry = "0.17.3"
opentelemetry = { version = "0.17" }

tokio.workspace = true
futures = "0.3"
futures.workspace = true
once_cell = "1.19.0"

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion query-engine/query-engine-node-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ opentelemetry = { version = "0.17" }

quaint.workspace = true
tokio.workspace = true
futures = "0.3"
futures.workspace = true
query-engine-metrics = { path = "../metrics" }

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion query-engine/query-engine-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ thiserror = "1"
url.workspace = true
serde.workspace = true
tokio = { version = "1", features = ["macros", "sync", "io-util", "time"] }
futures = "0.3"
futures.workspace = true

tracing.workspace = true
tracing-subscriber = { version = "0.3" }
Expand Down
2 changes: 1 addition & 1 deletion query-engine/request-handlers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ itertools.workspace = true
graphql-parser = { git = "https://github.com/prisma/graphql-parser", optional = true }
serde.workspace = true
serde_json.workspace = true
futures = "0.3"
futures.workspace = true
indexmap.workspace = true
bigdecimal = "0.3"
thiserror = "1"
Expand Down
4 changes: 2 additions & 2 deletions schema-engine/connectors/mongodb-schema-connector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ user-facing-errors = { path = "../../../libs/user-facing-errors", features = [
] }

enumflags2.workspace = true
futures = "0.3"
futures.workspace = true
mongodb.workspace = true
bson.workspace = true
serde_json.workspace = true
Expand All @@ -33,4 +33,4 @@ url.workspace = true
expect-test = "1"
names = { version = "0.12", default-features = false }
itertools.workspace = true
indoc.workspace = true
indoc.workspace = true
2 changes: 1 addition & 1 deletion schema-engine/mongodb-schema-describer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ edition = "2021"
[dependencies]
mongodb.workspace = true
bson.workspace = true
futures = "0.3"
futures.workspace = true
serde.workspace = true

0 comments on commit eef973b

Please sign in to comment.