Skip to content

Commit

Permalink
chore: move itertools to workspace dependencies (#4575)
Browse files Browse the repository at this point in the history
* Move `itertools` to workspace dependencies to make it easier to manage
  its version.

* Update `itertools` to 0.12.

* Update `sqlformat` to 0.2.3 to avoid having both
  `itertools 0.10.5` and `itertools 0.12.0` in the compiled binaries.

Closes: prisma/team-orm#750
  • Loading branch information
aqrln authored Dec 16, 2023
1 parent e2ce1ac commit 61928b0
Show file tree
Hide file tree
Showing 13 changed files with 40 additions and 30 deletions.
45 changes: 27 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ tokio = { version = "1.25", features = [
user-facing-errors = { path = "./libs/user-facing-errors" }
uuid = { version = "1", features = ["serde"] }
indoc = "2.0.1"
itertools = "0.12"
connection-string = "0.2"
napi = { version = "2.12.4", default-features = false, features = [
"napi8",
Expand Down
2 changes: 1 addition & 1 deletion libs/user-facing-errors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ serde.workspace = true
backtrace = "0.3.40"
tracing = "0.1"
indoc.workspace = true
itertools = "0.10"
itertools.workspace = true
quaint = { path = "../../quaint", optional = true }

[features]
Expand Down
2 changes: 1 addition & 1 deletion psl/psl-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ schema-ast = { path = "../schema-ast" }

bigdecimal = "0.3"
chrono = { version = "0.4.6", default_features = false }
itertools = "0.10"
itertools.workspace = true
once_cell = "1.3.1"
regex = "1.3.7"
serde.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions quaint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ metrics = "0.18"
futures = "0.3"
url = "2.1"
hex = "0.4"
itertools = "0.10"
itertools.workspace = true

either = { version = "1.6" }
base64 = { version = "0.12.3" }
Expand All @@ -88,7 +88,7 @@ bit-vec = { version = "0.6.1", optional = true }
bytes = { version = "1.0", optional = true }
mobc = { version = "0.8", optional = true }
serde = { version = "1.0", optional = true }
sqlformat = { version = "0.2.0", optional = true }
sqlformat = { version = "0.2.3", optional = true }
uuid = { version = "1", features = ["v4"] }
crosstarget-utils = { path = "../libs/crosstarget-utils" }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ user-facing-errors = { path = "../../../libs/user-facing-errors" }
thiserror = "1.0"
async-trait = "0.1"
nom = "7.1"
itertools = "0.10"
itertools.workspace = true
regex = "1"
serde.workspace = true
tracing = "0.1"
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 @@ -9,7 +9,7 @@ async-trait = "0.1"
bigdecimal = "0.3"
# bson = {version = "1.1.0", features = ["decimal128"]}
futures = "0.3"
itertools = "0.10"
itertools.workspace = true
mongodb = "2.8.0"
bson = { version = "2.4.0", features = ["chrono-0_4", "uuid-1"] }
rand = "0.7"
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 @@ -8,7 +8,7 @@ anyhow = "1.0"
async-trait = "0.1.31"
chrono = {version = "0.4", features = ["serde"]}
futures = "0.3"
itertools = "0.10"
itertools.workspace = true
query-structure = {path = "../../query-structure"}
prisma-value = {path = "../../../libs/prisma-value"}
serde.workspace = true
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 @@ -15,7 +15,7 @@ anyhow = "1.0"
async-trait = "0.1"
bigdecimal = "0.3"
futures = "0.3"
itertools = "0.10"
itertools.workspace = true
once_cell = "1.3"
rand = "0.7"
serde_json = {version = "1.0", features = ["float_roundtrip"]}
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 @@ -17,7 +17,7 @@ crossbeam-channel = "0.5.6"
psl.workspace = true
futures = "0.3"
indexmap = { version = "1.7", features = ["serde-1"] }
itertools = "0.10"
itertools.workspace = true
once_cell = "1"
petgraph = "0.4"
query-structure = { path = "../query-structure", features = [
Expand Down
2 changes: 1 addition & 1 deletion query-engine/dmmf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ pretty_assertions = "1"
flate2 = "1.0"
similar = { version = "2.2.1", features=["text", "inline", "bytes"] }
colored = "2.0.0"
itertools = "0.10.5"
itertools.workspace = true
2 changes: 1 addition & 1 deletion query-engine/query-structure/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = "0.0.0"

[dependencies]
psl.workspace = true
itertools = "0.10"
itertools.workspace = true
prisma-value = { path = "../../libs/prisma-value" }
bigdecimal = "0.3"
thiserror = "1.0"
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 @@ -10,7 +10,7 @@ user-facing-errors = { path = "../../libs/user-facing-errors" }
quaint = { path = "../../quaint" }
psl.workspace = true
dmmf_crate = { path = "../dmmf", package = "dmmf" }
itertools = "0.10"
itertools.workspace = true
graphql-parser = { git = "https://github.com/prisma/graphql-parser", optional = true }
serde.workspace = true
serde_json.workspace = true
Expand Down

0 comments on commit 61928b0

Please sign in to comment.