From 95fb8b6a064ce5de9ed323ffb549ea8ac58dd241 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Sat, 8 Feb 2025 17:58:57 +0100 Subject: [PATCH] First step of workspace splitting --- Cargo.toml | 32 ++++--------------- ravenous-tools/Cargo.toml | 26 +++++++++++++++ {src => ravenous-tools/src}/graphs.rs | 4 +-- {src => ravenous-tools/src}/main.rs | 11 +++---- {src => ravenous-tools/src}/makepdf.rs | 0 .../src}/makepdf_functions.rs | 1 + {src => ravenous-tools/src}/makepdf_misc.rs | 0 .../src}/makepdf_structs.rs | 1 - {src => ravenous-tools/src}/stat_algo.rs | 0 {src => ravenous-tools/src}/stat_io.rs | 0 {src => ravenous-tools/src}/stat_structs.rs | 0 {src => ravenous-tools/src}/stats.rs | 0 {src => ravenous-tools/src}/table_structs.rs | 0 {src => ravenous-tools/src}/table_types.rs | 0 {src => ravenous-tools/src}/tablegen.rs | 0 tablegen/Cargo.toml | 6 ++++ tablegen/src/lib.rs | 14 ++++++++ 17 files changed, 60 insertions(+), 35 deletions(-) create mode 100644 ravenous-tools/Cargo.toml rename {src => ravenous-tools/src}/graphs.rs (98%) rename {src => ravenous-tools/src}/main.rs (94%) rename {src => ravenous-tools/src}/makepdf.rs (100%) rename {src => ravenous-tools/src}/makepdf_functions.rs (99%) rename {src => ravenous-tools/src}/makepdf_misc.rs (100%) rename {src => ravenous-tools/src}/makepdf_structs.rs (99%) rename {src => ravenous-tools/src}/stat_algo.rs (100%) rename {src => ravenous-tools/src}/stat_io.rs (100%) rename {src => ravenous-tools/src}/stat_structs.rs (100%) rename {src => ravenous-tools/src}/stats.rs (100%) rename {src => ravenous-tools/src}/table_structs.rs (100%) rename {src => ravenous-tools/src}/table_types.rs (100%) rename {src => ravenous-tools/src}/tablegen.rs (100%) create mode 100644 tablegen/Cargo.toml create mode 100644 tablegen/src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index 73a76e9..3b7d8db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,32 +1,12 @@ -# cargo-features = ["codegen-backend"] -[package] -name = "ravenous-tools" -version = "0.1.4" -edition = "2021" +[workspace] +members = [ + "ravenous-tools", + "tablegen", +] +resolver = "3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[dependencies] -anyhow = "1.0.86" -charts-rs = { version = "0.3.11" } -clap = { version = "4.5.7", features = ["derive"] } -console = "0.15.8" -csv = "1.3.0" -debug_print = "1.0.0" -dynfmt = { version = "0.1.5", features = ["curly"] } -glob = "0.3.1" -indexmap = "2.2.6" -indicatif = "0.17.8" -logos = "0.14.0" -phf = { version = "0.11.2", features = ["macros"] } -regex = "1.10.5" -regex_static = "0.1.1" -ron = "0.8.1" -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.117" -tokio = { version = "1.38.0", features = ["full"] } -toml = "0.8.14" - [profile.dev] debug = 0 # codegen-backend = "cranelift" diff --git a/ravenous-tools/Cargo.toml b/ravenous-tools/Cargo.toml new file mode 100644 index 0000000..b1af0e2 --- /dev/null +++ b/ravenous-tools/Cargo.toml @@ -0,0 +1,26 @@ +# cargo-features = ["codegen-backend"] +[package] +name = "ravenous-tools" +version = "0.1.4" +edition = "2024" + +[dependencies] +anyhow = "1.0.86" +charts-rs = { version = "0.3.11" } +clap = { version = "4.5.7", features = ["derive"] } +console = "0.15.8" +csv = "1.3.0" +debug_print = "1.0.0" +dynfmt = { version = "0.1.5", features = ["curly"] } +glob = "0.3.1" +indexmap = "2.2.6" +indicatif = "0.17.8" +logos = "0.14.0" +phf = { version = "0.11.2", features = ["macros"] } +regex = "1.10.5" +regex_static = "0.1.1" +ron = "0.8.1" +serde = { version = "1.0.203", features = ["derive"] } +serde_json = "1.0.117" +tokio = { version = "1.38.0", features = ["full"] } +toml = "0.8.14" diff --git a/src/graphs.rs b/ravenous-tools/src/graphs.rs similarity index 98% rename from src/graphs.rs rename to ravenous-tools/src/graphs.rs index 30822a6..ae69d0f 100644 --- a/src/graphs.rs +++ b/ravenous-tools/src/graphs.rs @@ -1,7 +1,7 @@ //! Export graphs -use charts_rs::{get_or_try_init_fonts, RadarChart, RadarIndicator, Series}; use charts_rs::{Box, Color}; +use charts_rs::{RadarChart, RadarIndicator, Series, get_or_try_init_fonts}; use glob::glob; use serde::{Deserialize, Serialize}; use std::io::Read; @@ -114,7 +114,7 @@ fn del_graphs(args: &GraphConfig) -> Result<()> { /// Generate the graph and save it fn gen_graph(args: &GraphConfig) -> Result<()> { // Import CSV - let data = include_bytes!("../data/lmroman8-regular.ttf") as &[u8]; + let data = include_bytes!("../../data/lmroman8-regular.ttf") as &[u8]; get_or_try_init_fonts(Some(vec![data])).unwrap(); let csv = import_csv(args)?; diff --git a/src/main.rs b/ravenous-tools/src/main.rs similarity index 94% rename from src/main.rs rename to ravenous-tools/src/main.rs index f022bb8..fb62d80 100644 --- a/src/main.rs +++ b/ravenous-tools/src/main.rs @@ -3,7 +3,6 @@ //! This program is meant as a helper for the ravenous project. //! -// #![allow(dead_code)] #![warn(missing_docs)] #![warn(clippy::missing_docs_in_private_items)] mod graphs; @@ -26,10 +25,10 @@ use std::{ use anyhow::{Context, Result}; use clap::{Args, Parser, Subcommand}; -use graphs::{make_graphs, GraphConfig}; -use makepdf::{make_pdf, MakeConfig}; +use graphs::{GraphConfig, make_graphs}; +use makepdf::{MakeConfig, make_pdf}; use serde::Deserialize; -use stats::{stat_solver, StatConfig}; +use stats::{StatConfig, stat_solver}; use table_structs::Craft; use tablegen::table_gen; @@ -63,8 +62,8 @@ struct ConfigArgs { /// Wether to write the config to file, or just show it #[arg(short, long, default_value_t = false)] write: bool, - /// Wether to overwrite the file if it exists + /// Wether to overwrite the file if it exists #[arg(short, long, default_value_t = false)] force: bool, @@ -97,7 +96,7 @@ struct Classes { fn main() -> Result<()> { let args = ParserCLIArgs::parse(); let config_str = &fs::read_to_string("helper_config.toml") - .unwrap_or(include_str!("../helper_config.toml").to_string()); + .unwrap_or(include_str!("../../helper_config.toml").to_string()); let config: Config = toml::from_str(config_str).expect("Coudln't read the config file"); match args.command { Commands::Tablegen(args) => table_gen(&args, &config), diff --git a/src/makepdf.rs b/ravenous-tools/src/makepdf.rs similarity index 100% rename from src/makepdf.rs rename to ravenous-tools/src/makepdf.rs diff --git a/src/makepdf_functions.rs b/ravenous-tools/src/makepdf_functions.rs similarity index 99% rename from src/makepdf_functions.rs rename to ravenous-tools/src/makepdf_functions.rs index 274df5a..7d152a6 100644 --- a/src/makepdf_functions.rs +++ b/ravenous-tools/src/makepdf_functions.rs @@ -90,6 +90,7 @@ pub(super) fn make_file(args: &MakeConfig) -> BuilderParseResult { } } +/// Execute an external git command macro_rules! exec_cmd { ($cmd:expr, $args:expr) => { { diff --git a/src/makepdf_misc.rs b/ravenous-tools/src/makepdf_misc.rs similarity index 100% rename from src/makepdf_misc.rs rename to ravenous-tools/src/makepdf_misc.rs diff --git a/src/makepdf_structs.rs b/ravenous-tools/src/makepdf_structs.rs similarity index 99% rename from src/makepdf_structs.rs rename to ravenous-tools/src/makepdf_structs.rs index 2b21796..3d33b11 100644 --- a/src/makepdf_structs.rs +++ b/ravenous-tools/src/makepdf_structs.rs @@ -254,7 +254,6 @@ pub(super) enum LineType { //TODO: Fix name collection // #[regex(r"(\)+ )?\(\./[A-z/]+\.tex", |lex| lex.slice().split("(").next().unwrap_or("").to_string())] // #[regex(r"(\)+ )?(\[\w+\])?\(\./[A-z/]+\.tex", |lex| lex.slice().split("(").next().unwrap_or("").to_string())] - // #[regex(r"[\) ]*\(\./[A-z/]+\.tex", |lex| lex.slice().split("(").nth(1).unwrap_or("").to_string())] // #[regex(r"[\) ]*(\[[0-9]+\] )?\(\./[A-z/-_]+\.tex", |lex| lex.slice().split("(").nth(1).unwrap_or("").to_string())] // #[regex(r"[\) 0-9\[\]]*\(\./[A-z/-_]+\.tex", |lex| lex.slice().split("(").nth(1).unwrap_or("").to_string())] diff --git a/src/stat_algo.rs b/ravenous-tools/src/stat_algo.rs similarity index 100% rename from src/stat_algo.rs rename to ravenous-tools/src/stat_algo.rs diff --git a/src/stat_io.rs b/ravenous-tools/src/stat_io.rs similarity index 100% rename from src/stat_io.rs rename to ravenous-tools/src/stat_io.rs diff --git a/src/stat_structs.rs b/ravenous-tools/src/stat_structs.rs similarity index 100% rename from src/stat_structs.rs rename to ravenous-tools/src/stat_structs.rs diff --git a/src/stats.rs b/ravenous-tools/src/stats.rs similarity index 100% rename from src/stats.rs rename to ravenous-tools/src/stats.rs diff --git a/src/table_structs.rs b/ravenous-tools/src/table_structs.rs similarity index 100% rename from src/table_structs.rs rename to ravenous-tools/src/table_structs.rs diff --git a/src/table_types.rs b/ravenous-tools/src/table_types.rs similarity index 100% rename from src/table_types.rs rename to ravenous-tools/src/table_types.rs diff --git a/src/tablegen.rs b/ravenous-tools/src/tablegen.rs similarity index 100% rename from src/tablegen.rs rename to ravenous-tools/src/tablegen.rs diff --git a/tablegen/Cargo.toml b/tablegen/Cargo.toml new file mode 100644 index 0000000..701a557 --- /dev/null +++ b/tablegen/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "tablegen" +version = "0.1.0" +edition = "2024" + +[dependencies] diff --git a/tablegen/src/lib.rs b/tablegen/src/lib.rs new file mode 100644 index 0000000..b93cf3f --- /dev/null +++ b/tablegen/src/lib.rs @@ -0,0 +1,14 @@ +pub fn add(left: u64, right: u64) -> u64 { + left + right +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn it_works() { + let result = add(2, 2); + assert_eq!(result, 4); + } +}