From d28da80b00defb23ac16d9a66194da349f2aa5a6 Mon Sep 17 00:00:00 2001 From: "Arnaud (Arhuman) ASSAD" Date: Mon, 16 May 2022 07:22:24 +0200 Subject: [PATCH] Switch to a more standard (?) binary crate layout --- Cargo.toml | 6 +++++- src/{arguments.rs => arguments/mod.rs} | 0 src/{carman.rs => main.rs} | 9 ++++++--- src/{settings.rs => settings/mod.rs} | 0 4 files changed, 11 insertions(+), 4 deletions(-) rename src/{arguments.rs => arguments/mod.rs} (100%) rename src/{carman.rs => main.rs} (53%) rename src/{settings.rs => settings/mod.rs} (100%) diff --git a/Cargo.toml b/Cargo.toml index 7181200..51949a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,4 +7,8 @@ edition = "2021" [dependencies] clap = { version = "3.1.6", features = ["derive"] } -regex = { version = "*" } +config = { version = "0.13.1" } +serde_derive = { version = "1.0.8" } +serde = { version = "*" } + +[dev-dependencies] diff --git a/src/arguments.rs b/src/arguments/mod.rs similarity index 100% rename from src/arguments.rs rename to src/arguments/mod.rs diff --git a/src/carman.rs b/src/main.rs similarity index 53% rename from src/carman.rs rename to src/main.rs index a716244..7ff9dca 100644 --- a/src/carman.rs +++ b/src/main.rs @@ -1,14 +1,17 @@ -mod carman; use clap::Parser; -use carman::Arguments; -use carman::Settings; /// Carman code deployment Daemon +mod arguments; +use arguments::Arguments; +mod settings; +use settings::Settings; fn main() { let args = Arguments::parse(); + let config = Settings::new(); println!("Hello, world!"); println!("{:?}", args); + println!("{:?}", config); } diff --git a/src/settings.rs b/src/settings/mod.rs similarity index 100% rename from src/settings.rs rename to src/settings/mod.rs