From cf71d6b8cb147bd2b951d468fa3d5f40355ec5fa Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Fri, 23 Jan 2026 10:15:15 +0100 Subject: [PATCH] Makes workspace dependencies --- Cargo.toml | 26 +++++++++++++++++++ crates/cli_parser/Cargo.toml | 6 ++--- crates/config/Cargo.toml | 6 ++--- crates/config/src/fast_tables.rs | 8 +++--- crates/fast_class/Cargo.toml | 5 +++- crates/formatter/Cargo.toml | 12 ++++----- crates/graphs/Cargo.toml | 16 ++++++------ crates/make/Cargo.toml | 23 +++++++++-------- crates/more_fields/Cargo.toml | 2 +- crates/more_fields_macro/Cargo.toml | 4 +-- crates/ravenous-tools/Cargo.toml | 25 +++++++++--------- crates/stats/Cargo.toml | 10 ++++---- crates/tablegen/Cargo.toml | 20 +++++++-------- crates/weaponry/Cargo.toml | 39 +++++++++++++++-------------- 14 files changed, 116 insertions(+), 86 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 26bd5d7..2b5c5bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,3 +29,29 @@ lto = false codegen-units = 256 incremental = true panic = "abort" + +[workspace.dependencies] +config = {path = "./crates/config"} +tablegen = {path = "./crates/tablegen"} +graphs = {path = "./crates/graphs"} +cli_parser = {path = "./crates/cli_parser"} +stats = {path = "./crates/stats"} +make = {path = "./crates/make"} +fast_class = {path = "./crates/fast_class"} +formatter = {path = "./crates/formatter"} +weaponry = {path = "./crates/weaponry"} + +anyhow = "1.0.103" +toml = "1.1.2" +clap = { version = "4.6.1", features = ["derive"] } +phf = { version = "0.14.0", features = ["macros"] } +regex = "1.13.0" +regex_static = "0.1.1" +serde = { version = "1.0.228", features = ["derive", "alloc"] } +csv = "1.4.0" +ron = "0.12.2" +glob = "0.3.3" +tokio = { version = "1.52.3", features = ["full"] } +dynfmt = { version = "0.1.5", features = ["curly"] } +pretty_assertions = "^1.4" + diff --git a/crates/cli_parser/Cargo.toml b/crates/cli_parser/Cargo.toml index 6f46ca7..bd01c48 100644 --- a/crates/cli_parser/Cargo.toml +++ b/crates/cli_parser/Cargo.toml @@ -4,6 +4,6 @@ version = "0.1.7" edition = "2024" [dependencies] -config = {path = "../config"} -clap = { version = "4.5.28", features = ["derive"] } -serde = { version = "1.0.217", features = ["derive", "alloc"] } +config = {workspace = true} +clap = {workspace = true} +serde = {workspace = true} diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index c1a2c3b..1fc9b4a 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -4,6 +4,6 @@ version = "0.1.1" edition = "2024" [dependencies] -clap = { version = "4.5.28", features = ["derive"] } -phf = { version = "0.13.1", features = ["macros"] } -serde = { version = "1.0.217", features = ["derive"] } +clap = {workspace = true} +phf = {workspace = true} +serde = {workspace = true} diff --git a/crates/config/src/fast_tables.rs b/crates/config/src/fast_tables.rs index c9bdd86..ef45dd0 100644 --- a/crates/config/src/fast_tables.rs +++ b/crates/config/src/fast_tables.rs @@ -1,9 +1,9 @@ //! # `fast_table` Configuration //! //! This module defines the command‑line configuration used by the **fast‑tables** -//! tool. The struct `FastTableConfig` is a thin wrapper around the `clap` +//! tool. The struct `FastTableConfig` is a thin wrapper around the `clap` //! `Args` derive macro, which automatically turns the struct into a CLI -//! parser. All public fields are exposed to the user via command‑line flags +//! parser. All public fields are exposed to the user via command‑line flags //! (or environment variables) and are documented below. //! @@ -12,7 +12,7 @@ use clap::{Args, ValueEnum}; /// Configuration for the `fast‑tables` command. /// /// This struct is passed directly to `clap::Command::new` when creating the -/// CLI. Each field corresponds to a CLI flag; the attribute annotations +/// CLI. Each field corresponds to a CLI flag; the attribute annotations /// control how `clap` renders help text and parses values. /// #[derive(Args, Debug, Clone)] @@ -41,7 +41,7 @@ pub struct FastTableConfig { /// This enum implements `ValueEnum`, which gives it two important traits: /// * It can be used directly as a `clap` argument type. /// * It can be parsed from a string (`"classes"`, `"alchemy"`, etc.) in a -/// case‑insensitive manner. +/// case‑insensitive manner. #[derive(ValueEnum, Debug, Clone)] pub enum TableTargetType { /// Classes table diff --git a/crates/fast_class/Cargo.toml b/crates/fast_class/Cargo.toml index 258c4bc..61a87d4 100644 --- a/crates/fast_class/Cargo.toml +++ b/crates/fast_class/Cargo.toml @@ -4,4 +4,7 @@ version = "0.1.0" edition = "2024" [dependencies] -facet = "0.46.0" +config = {workspace = true} +cli_parser = {workspace = true} +anyhow = {workspace = true} +facet = "0.46.5" diff --git a/crates/formatter/Cargo.toml b/crates/formatter/Cargo.toml index 1ac8ba3..6e13c48 100644 --- a/crates/formatter/Cargo.toml +++ b/crates/formatter/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.1" edition = "2024" [dependencies] -config = {path = "../config"} -cli_parser = {path = "../cli_parser"} -regex = "1.11.1" -serde = { version = "1.0.217", features = ["derive", "alloc"] } -toml = "1.1.2" -anyhow = "1.0.95" +config = {workspace = true} +cli_parser = {workspace = true} +regex = {workspace = true} +serde = {workspace = true} +toml = {workspace = true} +anyhow = {workspace = true} diff --git a/crates/graphs/Cargo.toml b/crates/graphs/Cargo.toml index 1b0fd9c..77e9c17 100644 --- a/crates/graphs/Cargo.toml +++ b/crates/graphs/Cargo.toml @@ -4,11 +4,11 @@ version = "0.1.4" edition = "2024" [dependencies] -config = {path = "../config"} -cli_parser = {path = "../cli_parser"} -anyhow = "1.0.95" -charts-rs = { version = "0.4.2", features = ["image", "image-encoder"] } -glob = "0.3.2" -serde = { version = "1.0.217", features = ["derive", "alloc"] } -csv = "1.3.1" -ron = "0.12.1" +config = {workspace = true} +cli_parser = {workspace = true} +anyhow = {workspace = true} +charts-rs = { version = "0.7", features = ["image-encoder"] } +serde = {workspace = true} +csv = {workspace = true} +ron = {workspace = true} +glob = {workspace = true} diff --git a/crates/make/Cargo.toml b/crates/make/Cargo.toml index b249ce5..d4a525d 100644 --- a/crates/make/Cargo.toml +++ b/crates/make/Cargo.toml @@ -4,15 +4,16 @@ version = "0.1.2" edition = "2024" [dependencies] -config = {path = "../config"} -cli_parser = {path = "../cli_parser"} -dynfmt = { version = "0.1.5", features = ["curly"] } -indicatif = { version = "0.18.4", features = ["rayon"] } +config = {workspace = true} +cli_parser = {workspace = true} +anyhow = {workspace = true} +regex = {workspace = true} +serde = {workspace = true} +toml = {workspace = true} +tokio = {workspace = true} +dynfmt = {workspace = true} + +indicatif = { version = "0.18.6", features = ["rayon"] } logos = "0.16.1" -tokio = "1.43.0" -anyhow = "1.0.95" -indexmap = "2.7.1" -regex = "1.11.1" -serde = { version = "1.0.217", features = ["derive", "alloc"] } -console = "0.16.3" -toml = "1.1.2" +indexmap = "2.14.0" +console = "0.16.4" diff --git a/crates/more_fields/Cargo.toml b/crates/more_fields/Cargo.toml index 1c83567..2c8d1d3 100644 --- a/crates/more_fields/Cargo.toml +++ b/crates/more_fields/Cargo.toml @@ -7,7 +7,7 @@ version.workspace = true more_fields_macro = {path ="../more_fields_macro"} [dev-dependencies] -pretty_assertions = "1.4.1" +pretty_assertions = {workspace = true} [features] expand_macro = [] diff --git a/crates/more_fields_macro/Cargo.toml b/crates/more_fields_macro/Cargo.toml index aee9a23..30da338 100644 --- a/crates/more_fields_macro/Cargo.toml +++ b/crates/more_fields_macro/Cargo.toml @@ -7,5 +7,5 @@ version.workspace = true proc-macro = true [dependencies] -quote = "1.0.38" -syn = "2.0.98" +quote = "1.0.46" +syn = "2.0.118" diff --git a/crates/ravenous-tools/Cargo.toml b/crates/ravenous-tools/Cargo.toml index d3947d5..6044cd9 100644 --- a/crates/ravenous-tools/Cargo.toml +++ b/crates/ravenous-tools/Cargo.toml @@ -5,19 +5,18 @@ version = "0.1.8" edition = "2024" [dependencies] -tablegen = {path = "../tablegen"} -graphs = {path = "../graphs"} -cli_parser = {path = "../cli_parser"} -# config = {path = "../config"} -stats = {path = "../stats"} -make = {path = "../make"} -formatter = {path = "../formatter"} -weaponry = {path = "../weaponry"} - -anyhow = "1.0.95" -clap = { version = "4.5.28", features = ["derive"] } -tokio = { version = "1.43.0", features = ["full"] } -toml = "1.1.2" +tablegen = {workspace = true} +graphs = {workspace = true} +cli_parser = {workspace = true} +stats = {workspace = true} +make = {workspace = true} +fast_class = {workspace = true} +anyhow = {workspace = true} +toml = {workspace = true} +clap = {workspace = true} +tokio = {workspace = true} +formatter = {workspace = true} +weaponry = {workspace = true} [package.metadata.cargo-machete] ignored = ["tokio"] diff --git a/crates/stats/Cargo.toml b/crates/stats/Cargo.toml index 117b236..7beae5a 100644 --- a/crates/stats/Cargo.toml +++ b/crates/stats/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.1" edition = "2024" [dependencies] -config = {path = "../config"} -cli_parser = {path = "../cli_parser"} -anyhow = "1.0.95" -csv = "1.3.1" +config = {workspace = true} +cli_parser = {workspace = true} +anyhow = {workspace = true} +csv = {workspace = true} debug_print = "1.0.0" -serde = { version = "1.0.217", features = ["derive"] } +serde = {workspace = true} diff --git a/crates/tablegen/Cargo.toml b/crates/tablegen/Cargo.toml index 68aef67..ced1cac 100644 --- a/crates/tablegen/Cargo.toml +++ b/crates/tablegen/Cargo.toml @@ -4,13 +4,13 @@ version = "0.1.2" edition = "2024" [dependencies] -cli_parser = {path = "../cli_parser"} -config = {path = "../config"} -anyhow = "1.0.95" -csv = "1.3.1" -dynfmt = { version = "0.1.5", features = ["curly"] } -glob = "0.3.2" -phf = { version = "0.13.1", features = ["macros"] } -regex = "1.11.1" -regex_static = "0.1.1" -serde = { version = "1.0.217", features = ["derive", "alloc"] } +cli_parser = {workspace = true} +config = {workspace = true} +anyhow = {workspace = true} +csv = {workspace = true} +dynfmt = {workspace = true} +glob = {workspace = true} +phf = {workspace = true} +regex = {workspace = true} +regex_static = {workspace = true} +serde = {workspace = true} diff --git a/crates/weaponry/Cargo.toml b/crates/weaponry/Cargo.toml index 089a28d..05e4b0e 100644 --- a/crates/weaponry/Cargo.toml +++ b/crates/weaponry/Cargo.toml @@ -4,28 +4,29 @@ version = "0.1.1" edition = "2024" [dependencies] -config = {path = "../config"} -cli_parser = {path = "../cli_parser"} -more_fields = {path ="../more_fields"} -comfy-table = "7.1.4" -csv = "1.3.1" +config = {workspace = true} +cli_parser = {workspace = true} +more_fields = {workspace = true} +regex = {workspace = true} +csv = {workspace = true} +serde = {workspace = true} +comfy-table = "7.2.2" probability = "0.20.3" -rusqlite = { version = "0.33.0" } # , features = ["bundled"] -serde = { version = "1.0.217", features = ["derive"] } -serde_rusqlite = "0.37.0" -serde_json = { version = "1.0.138", features = ["alloc"] } -strum = { version = "0.27.0", features = ["derive"] } -thiserror = "2.0.11" -regex = "1.11.1" -charming = { version = "0.4.0", features = [] } +rusqlite = { version = "0.40.1" } # , features = ["bundled"] +serde_rusqlite = "0.43.0" +serde_json = { version = "1.0.150", features = ["alloc"] } +strum = { version = "0.28.0", features = ["derive"] } +thiserror = "2.0.18" +charming = { version = "0.6.0", features = [] } [dev-dependencies] -fastrand = "2.3.0" -criterion = { version = "0.5" } -regex = "1.11.1" -pretty_assertions = "^1.4" -logos = "^0.15" -clap = { version = "4.5.30", features = ["derive"] } +regex = {workspace = true} +pretty_assertions = {workspace = true} +clap = {workspace = true} + +fastrand = "2.4.1" +criterion = { version = "0.8" } +logos = "^0.16" [[bench]] name = "iter_creation"