From caaf06b620c4b5f6021b5a0cdb17c87f4a34ae05 Mon Sep 17 00:00:00 2001 From: glihm Date: Mon, 11 Nov 2024 14:42:46 -0600 Subject: [PATCH] chore: cleanup deps (#2680) * chore: cleanup wip * chore: cleanup deps 2 --- Cargo.lock | 91 ------------------------------ bin/torii/Cargo.toml | 1 - crates/dojo/lang/Cargo.toml | 23 -------- crates/dojo/lang/src/lib.rs | 2 + crates/dojo/test-utils/Cargo.toml | 3 - crates/dojo/test-utils/src/lib.rs | 2 +- crates/katana/rpc/rpc/Cargo.toml | 1 - crates/metrics/Cargo.toml | 3 - crates/metrics/src/lib.rs | 2 + crates/sozo/ops/Cargo.toml | 1 - crates/torii/types-test/Scarb.lock | 2 +- examples/simple/Scarb.lock | 2 +- examples/spawn-and-move/Scarb.lock | 2 +- 13 files changed, 8 insertions(+), 127 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e685c3e02f..dbb6be2642 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4689,43 +4689,20 @@ name = "dojo-lang" version = "1.0.0" dependencies = [ "anyhow", - "assert_fs", - "cairo-lang-compiler", - "cairo-lang-debug", "cairo-lang-defs", "cairo-lang-diagnostics", "cairo-lang-filesystem", - "cairo-lang-parser", "cairo-lang-plugins", - "cairo-lang-project", "cairo-lang-semantic", - "cairo-lang-sierra-generator", - "cairo-lang-starknet", - "cairo-lang-starknet-classes", "cairo-lang-syntax", - "cairo-lang-test-plugin", - "cairo-lang-test-utils", "cairo-lang-utils", - "camino", - "convert_case 0.6.0", "dojo-types 1.0.0", - "indoc 1.0.9", "itertools 0.12.1", - "once_cell", - "regex", - "salsa", - "semver 1.0.23", "serde", - "serde_json", - "serde_with 3.9.0", "smol_str", "starknet 0.12.0", "starknet-crypto 0.7.2", - "tempfile", - "test-log", - "toml 0.8.19", "tracing", - "url", ] [[package]] @@ -4741,7 +4718,6 @@ dependencies = [ name = "dojo-metrics" version = "1.0.0" dependencies = [ - "anyhow", "hyper 0.14.30", "jemalloc-ctl", "jemallocator", @@ -4751,8 +4727,6 @@ dependencies = [ "metrics-process", "metrics-util", "thiserror", - "tokio", - "tokio-util", "tracing", ] @@ -4764,8 +4738,6 @@ dependencies = [ "assert_fs", "async-trait", "camino", - "dojo-lang 1.0.0", - "dojo-world", "jsonrpsee 0.16.3", "katana-core", "katana-executor", @@ -6782,15 +6754,6 @@ dependencies = [ "http 0.2.12", ] -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.1" @@ -8400,7 +8363,6 @@ dependencies = [ "dojo-metrics", "dojo-test-utils", "dojo-utils", - "dojo-world", "futures", "indexmap 2.5.0", "jsonrpsee 0.16.3", @@ -12321,35 +12283,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" -[[package]] -name = "salsa" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b84d9f96071f3f3be0dc818eae3327625d8ebc95b58da37d6850724f31d3403" -dependencies = [ - "crossbeam-utils", - "indexmap 1.9.3", - "lock_api", - "log", - "oorandom", - "parking_lot 0.11.2", - "rustc-hash 1.1.0", - "salsa-macros", - "smallvec", -] - -[[package]] -name = "salsa-macros" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3904a4ba0a9d0211816177fd34b04c7095443f8cdacd11175064fe541c8fe2" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "salsa20" version = "0.10.2" @@ -13381,7 +13314,6 @@ dependencies = [ "anyhow", "assert_fs", "async-trait", - "bigdecimal 0.4.5", "cainome 0.4.6", "colored", "colored_json", @@ -14496,28 +14428,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" -[[package]] -name = "test-log" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" -dependencies = [ - "env_logger", - "test-log-macros", - "tracing-subscriber", -] - -[[package]] -name = "test-log-macros" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] - [[package]] name = "thiserror" version = "1.0.63" @@ -14995,7 +14905,6 @@ dependencies = [ "hyper-reverse-proxy", "indexmap 2.5.0", "lazy_static", - "scarb", "serde", "serde_json", "sqlx", diff --git a/bin/torii/Cargo.toml b/bin/torii/Cargo.toml index c526e2481c..a23a6cfcd8 100644 --- a/bin/torii/Cargo.toml +++ b/bin/torii/Cargo.toml @@ -25,7 +25,6 @@ hyper-reverse-proxy = { git = "https://github.com/tarrencev/hyper-reverse-proxy" hyper.workspace = true indexmap.workspace = true lazy_static.workspace = true -scarb.workspace = true serde.workspace = true serde_json.workspace = true sqlx.workspace = true diff --git a/crates/dojo/lang/Cargo.toml b/crates/dojo/lang/Cargo.toml index b65f2b554d..07647d5dc6 100644 --- a/crates/dojo/lang/Cargo.toml +++ b/crates/dojo/lang/Cargo.toml @@ -11,43 +11,20 @@ testing = [ ] [dependencies] anyhow.workspace = true -cairo-lang-compiler.workspace = true cairo-lang-defs.workspace = true cairo-lang-diagnostics.workspace = true cairo-lang-filesystem.workspace = true cairo-lang-plugins.workspace = true -cairo-lang-project.workspace = true cairo-lang-semantic.workspace = true -cairo-lang-sierra-generator.workspace = true -cairo-lang-starknet.workspace = true -cairo-lang-starknet-classes.workspace = true cairo-lang-syntax.workspace = true -cairo-lang-test-plugin.workspace = true cairo-lang-utils.workspace = true -camino.workspace = true -convert_case.workspace = true dojo-types.workspace = true -indoc.workspace = true itertools.workspace = true -regex.workspace = true -semver.workspace = true serde.workspace = true -serde_json.workspace = true -serde_with.workspace = true smol_str.workspace = true starknet.workspace = true starknet-crypto.workspace = true -tempfile.workspace = true -toml.workspace = true tracing.workspace = true -url.workspace = true [dev-dependencies] -assert_fs.workspace = true -cairo-lang-debug.workspace = true -cairo-lang-parser.workspace = true cairo-lang-semantic.workspace = true -cairo-lang-test-utils.workspace = true -once_cell.workspace = true -salsa.workspace = true -test-log.workspace = true diff --git a/crates/dojo/lang/src/lib.rs b/crates/dojo/lang/src/lib.rs index 7207eb6d67..f92c752fd0 100644 --- a/crates/dojo/lang/src/lib.rs +++ b/crates/dojo/lang/src/lib.rs @@ -2,6 +2,8 @@ //! //! This crate contains the Dojo compiler, with a cairo plugin for the Cairo language. +#![warn(unused_crate_dependencies)] + pub mod attribute_macros; pub mod aux_data; pub mod cairo_plugin; diff --git a/crates/dojo/test-utils/Cargo.toml b/crates/dojo/test-utils/Cargo.toml index 68f8d49c0c..fbff82a6bf 100644 --- a/crates/dojo/test-utils/Cargo.toml +++ b/crates/dojo/test-utils/Cargo.toml @@ -10,8 +10,6 @@ anyhow.workspace = true assert_fs.workspace = true async-trait.workspace = true camino.workspace = true -dojo-lang.workspace = true -dojo-world.workspace = true jsonrpsee = { workspace = true, features = [ "server" ] } katana-core = { workspace = true } katana-executor = { workspace = true, features = [ "blockifier" ] } @@ -29,7 +27,6 @@ url.workspace = true [build-dependencies] assert_fs.workspace = true camino.workspace = true -dojo-lang.workspace = true scarb.workspace = true scarb-ui.workspace = true diff --git a/crates/dojo/test-utils/src/lib.rs b/crates/dojo/test-utils/src/lib.rs index 71363b0556..48fcaf5848 100644 --- a/crates/dojo/test-utils/src/lib.rs +++ b/crates/dojo/test-utils/src/lib.rs @@ -1,4 +1,4 @@ -// #![warn(unused_crate_dependencies)] +#![warn(unused_crate_dependencies)] pub mod compiler; pub mod migration; diff --git a/crates/katana/rpc/rpc/Cargo.toml b/crates/katana/rpc/rpc/Cargo.toml index 3d73b86ca4..6ffc5703ac 100644 --- a/crates/katana/rpc/rpc/Cargo.toml +++ b/crates/katana/rpc/rpc/Cargo.toml @@ -34,7 +34,6 @@ assert_matches.workspace = true cainome.workspace = true dojo-test-utils.workspace = true dojo-utils.workspace = true -dojo-world.workspace = true indexmap.workspace = true jsonrpsee = { workspace = true, features = [ "client" ] } katana-cairo.workspace = true diff --git a/crates/metrics/Cargo.toml b/crates/metrics/Cargo.toml index 2faa0c043d..1d9e8a4d1c 100644 --- a/crates/metrics/Cargo.toml +++ b/crates/metrics/Cargo.toml @@ -6,10 +6,8 @@ version.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow.workspace = true hyper = { workspace = true, features = [ "http1", "http2", "server", "tcp" ] } thiserror.workspace = true -tokio.workspace = true tracing.workspace = true # Metrics @@ -18,7 +16,6 @@ metrics-derive = "0.1" metrics-exporter-prometheus = "0.15.3" metrics-process = "2.1.0" metrics-util = "0.17.0" -tokio-util.workspace = true [target.'cfg(not(windows))'.dependencies] jemalloc-ctl = { version = "0.5.0", optional = true } diff --git a/crates/metrics/src/lib.rs b/crates/metrics/src/lib.rs index acdbb44891..9da5adf81d 100644 --- a/crates/metrics/src/lib.rs +++ b/crates/metrics/src/lib.rs @@ -1,3 +1,5 @@ +#![warn(unused_crate_dependencies)] + pub mod exporters; mod process; mod server; diff --git a/crates/sozo/ops/Cargo.toml b/crates/sozo/ops/Cargo.toml index 96633a37a5..170612e2ec 100644 --- a/crates/sozo/ops/Cargo.toml +++ b/crates/sozo/ops/Cargo.toml @@ -8,7 +8,6 @@ version.workspace = true [dependencies] anyhow.workspace = true async-trait.workspace = true -bigdecimal = "0.4.5" cainome.workspace = true colored.workspace = true colored_json.workspace = true diff --git a/crates/torii/types-test/Scarb.lock b/crates/torii/types-test/Scarb.lock index fc1661504d..9586b50372 100644 --- a/crates/torii/types-test/Scarb.lock +++ b/crates/torii/types-test/Scarb.lock @@ -14,7 +14,7 @@ version = "2.8.4" [[package]] name = "types_test" -version = "1.0.0-rc.0" +version = "1.0.0" dependencies = [ "dojo", ] diff --git a/examples/simple/Scarb.lock b/examples/simple/Scarb.lock index c8ee34f166..4067faed93 100644 --- a/examples/simple/Scarb.lock +++ b/examples/simple/Scarb.lock @@ -3,7 +3,7 @@ version = 1 [[package]] name = "dojo" -version = "1.0.0-rc.0" +version = "1.0.0" dependencies = [ "dojo_plugin", ] diff --git a/examples/spawn-and-move/Scarb.lock b/examples/spawn-and-move/Scarb.lock index ffb9f46710..be41715c0c 100644 --- a/examples/spawn-and-move/Scarb.lock +++ b/examples/spawn-and-move/Scarb.lock @@ -31,7 +31,7 @@ dependencies = [ [[package]] name = "dojo_examples" -version = "1.0.0-rc.0" +version = "1.0.0" dependencies = [ "armory", "bestiary",