From 287f466ae1c89edfd9caeb122adbb08d78721962 Mon Sep 17 00:00:00 2001 From: Snowiiii Date: Mon, 21 Oct 2024 19:36:42 +0200 Subject: [PATCH] More workspace dependencies --- Cargo.toml | 4 ++++ pumpkin-config/Cargo.toml | 2 +- pumpkin-core/Cargo.toml | 5 +++-- pumpkin-inventory/Cargo.toml | 8 ++++---- pumpkin-macros/Cargo.toml | 7 ++++--- pumpkin-protocol/Cargo.toml | 19 +++++++++---------- pumpkin-registry/Cargo.toml | 4 ++-- pumpkin-world/Cargo.toml | 19 +++++++++---------- pumpkin/Cargo.toml | 19 +++++++++---------- 9 files changed, 45 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d32f8e1a0..a1dc7459f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,6 +31,10 @@ tokio = { version = "1.40", features = [ "sync", ] } +thiserror = "1.0" +num-traits = "0.2" +num-derive = "0.4" + # Concurrency/Parallelism and Synchronization rayon = "1.10.0" parking_lot = "0.12.3" diff --git a/pumpkin-config/Cargo.toml b/pumpkin-config/Cargo.toml index 5c2a8df09..a06c11e29 100644 --- a/pumpkin-config/Cargo.toml +++ b/pumpkin-config/Cargo.toml @@ -9,4 +9,4 @@ serde.workspace = true log.workspace = true toml = "0.8" -serde-inline-default = "0.2.1" +serde-inline-default = "0.2.2" diff --git a/pumpkin-core/Cargo.toml b/pumpkin-core/Cargo.toml index b1b756968..bb386ba16 100644 --- a/pumpkin-core/Cargo.toml +++ b/pumpkin-core/Cargo.toml @@ -6,9 +6,10 @@ edition.workspace = true [dependencies] serde.workspace = true uuid.workspace = true +num-traits.workspace = true +num-derive.workspace = true + fastnbt = { git = "https://github.com/owengage/fastnbt.git" } colored = "2" md5 = "0.7.0" -num-traits = "0.2.19" -num-derive = { version = "0.4.2" } diff --git a/pumpkin-inventory/Cargo.toml b/pumpkin-inventory/Cargo.toml index ba96c7a05..b5c60b2f7 100644 --- a/pumpkin-inventory/Cargo.toml +++ b/pumpkin-inventory/Cargo.toml @@ -8,10 +8,10 @@ edition.workspace = true pumpkin-world = { path = "../pumpkin-world" } log.workspace = true - -num-traits = "0.2" -num-derive = "0.4" -thiserror = "1.0.63" itertools.workspace = true crossbeam.workspace = true tokio.workspace = true +thiserror.workspace = true + +num-traits.workspace = true +num-derive.workspace = true diff --git a/pumpkin-macros/Cargo.toml b/pumpkin-macros/Cargo.toml index 5dca73b94..92802437b 100644 --- a/pumpkin-macros/Cargo.toml +++ b/pumpkin-macros/Cargo.toml @@ -7,9 +7,10 @@ edition.workspace = true proc-macro = true [dependencies] +serde.workspace = true +itertools.workspace = true + proc-macro2 = "1.0" quote = "1.0" syn = "2.0" -serde.workspace = true -itertools.workspace = true -serde_json = "1.0.128" +serde_json = "1.0.132" diff --git a/pumpkin-protocol/Cargo.toml b/pumpkin-protocol/Cargo.toml index 61d69ffe0..f5256305b 100644 --- a/pumpkin-protocol/Cargo.toml +++ b/pumpkin-protocol/Cargo.toml @@ -9,22 +9,21 @@ pumpkin-macros = { path = "../pumpkin-macros" } pumpkin-world = { path = "../pumpkin-world" } pumpkin-core = { path = "../pumpkin-core" } +uuid.workspace = true +serde.workspace = true +thiserror.workspace = true +itertools.workspace = true +log.workspace = true + +num-traits.workspace = true +num-derive.workspace = true + bytes = "1.7" -uuid.workspace = true - -serde.workspace = true - flate2 = "1.0" -thiserror = "1.0" -log.workspace = true -num-traits = "0.2" -num-derive = "0.4" - # encryption aes = "0.8.4" cfb8 = "0.8.1" -itertools.workspace = true fastnbt = { git = "https://github.com/owengage/fastnbt.git" } diff --git a/pumpkin-registry/Cargo.toml b/pumpkin-registry/Cargo.toml index 922cd5b06..745eb4ffd 100644 --- a/pumpkin-registry/Cargo.toml +++ b/pumpkin-registry/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true pumpkin-protocol = { path = "../pumpkin-protocol" } pumpkin-core = { path = "../pumpkin-core" } +serde.workspace = true + # nbt fastnbt = { git = "https://github.com/owengage/fastnbt.git" } - -serde.workspace = true diff --git a/pumpkin-world/Cargo.toml b/pumpkin-world/Cargo.toml index 311438a0b..cf0953993 100644 --- a/pumpkin-world/Cargo.toml +++ b/pumpkin-world/Cargo.toml @@ -7,30 +7,29 @@ edition.workspace = true pumpkin-core = { path = "../pumpkin-core" } pumpkin-macros = { path = "../pumpkin-macros" } -fastnbt = { git = "https://github.com/owengage/fastnbt.git" } tokio.workspace = true rayon.workspace = true derive_more.workspace = true itertools.workspace = true -thiserror = "1.0" +thiserror.workspace = true +serde.workspace = true +log.workspace = true +parking_lot.workspace = true + +num-traits.workspace = true +num-derive.workspace = true futures = "0.3" # Compression flate2 = "1.0" -lz4 = "1.11.1" +lz4 = "1.28.0" -serde.workspace = true serde_json = "1.0" enum_dispatch = "0.3.13" derive-getters = "0.5.0" -log.workspace = true - -parking_lot.workspace = true +fastnbt = { git = "https://github.com/owengage/fastnbt.git" } noise = "0.9.0" rand = "0.8.5" - -num-traits = "0.2" -num-derive = "0.4" diff --git a/pumpkin/Cargo.toml b/pumpkin/Cargo.toml index 66ad44558..1ad6017d2 100644 --- a/pumpkin/Cargo.toml +++ b/pumpkin/Cargo.toml @@ -15,6 +15,15 @@ pumpkin-protocol = { path = "../pumpkin-protocol" } pumpkin-registry = { path = "../pumpkin-registry" } itertools.workspace = true +log.workspace = true +crossbeam.workspace = true +uuid.workspace = true +tokio.workspace = true +rayon.workspace = true +thiserror.workspace = true + +num-traits.workspace = true +num-derive.workspace = true # config serde.workspace = true @@ -24,8 +33,6 @@ bytes = "1.7" rand = "0.8.5" -num-traits = "0.2" -num-derive = "0.4" num-bigint = "0.4" ctrlc = "3.4" @@ -49,17 +56,9 @@ digest = "=0.11.0-pre.9" hmac = "0.12.1" sha2 = "0.10.8" -thiserror = "1.0" - # icon loading base64 = "0.22.1" png = "0.17.14" # logging simple_logger = { version = "5.0.0", features = ["threads"] } -log.workspace = true - -crossbeam.workspace = true -uuid.workspace = true -tokio.workspace = true -rayon.workspace = true