refactor projekt to implement and test other cli libs

2022-12-13 05:02:02 +01:00 · 2022-12-13 05:02:02 +01:00 · 8b16296d5e
commit 8b16296d5e
parent f091f19a55
34 changed files with 35 additions and 15 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -3,9 +3,14 @@
 version = 3

 [[package]]
-name = "adventofcode2022"
+name = "aoc"
+version = "2022.1.0"
+
+[[package]]
+name = "aoc22-clap"
 version = "2022.1.0"
 dependencies = [
+ "aoc",
 "clap",
 ]

@ -118,9 +123,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.137"
+version = "0.2.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"

 [[package]]
 name = "linux-raw-sys"
@ -184,9 +189,9 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23"
+checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
 dependencies = [
 "bitflags",
 "errno",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,8 +1,6 @@
-[package]
-name = "adventofcode2022"
-version = "2022.1.0"
-edition = "2021"
+[workspace]

-
-[dependencies]
-clap = { version = "4.0.29", features = ["derive"] }
+members = [
+"aoc22-clap",
+"aoc"
+]
--- a/aoc/Cargo.toml
+++ b/aoc/Cargo.toml
@ -0,0 +1,6 @@
+[package]
+name = "aoc"
+version = "2022.1.0"
+edition = "2021"
+
+[dependencies]
--- a/aoc/src/lib.rs
+++ b/aoc/src/lib.rs
@ -0,0 +1,4 @@
+pub mod year2022;
+pub mod util;
+
+pub use year2022::*;
--- a/aoc/src/util.rs
+++ b/aoc/src/util.rs
--- a/aoc/src/year2022/day001.rs
+++ b/aoc/src/year2022/day001.rs
--- a/aoc/src/year2022/day002.rs
+++ b/aoc/src/year2022/day002.rs
--- a/aoc/src/year2022/day003.rs
+++ b/aoc/src/year2022/day003.rs
--- a/aoc/src/year2022/day004.rs
+++ b/aoc/src/year2022/day004.rs
--- a/aoc/src/year2022/day005.rs
+++ b/aoc/src/year2022/day005.rs
--- a/aoc/src/year2022/day006.rs
+++ b/aoc/src/year2022/day006.rs
--- a/aoc/src/year2022/day007.rs
+++ b/aoc/src/year2022/day007.rs
--- a/aoc/src/year2022/day008.rs
+++ b/aoc/src/year2022/day008.rs
--- a/aoc/src/year2022/day009.rs
+++ b/aoc/src/year2022/day009.rs
--- a/aoc/src/year2022/day010.rs
+++ b/aoc/src/year2022/day010.rs
--- a/aoc/src/year2022/day011.rs
+++ b/aoc/src/year2022/day011.rs
--- a/aoc/src/year2022/day012.rs
+++ b/aoc/src/year2022/day012.rs
--- a/aoc/src/year2022/day013.rs
+++ b/aoc/src/year2022/day013.rs
--- a/aoc/src/year2022/day014.rs
+++ b/aoc/src/year2022/day014.rs
--- a/aoc/src/year2022/day015.rs
+++ b/aoc/src/year2022/day015.rs
--- a/aoc/src/year2022/day016.rs
+++ b/aoc/src/year2022/day016.rs
--- a/aoc/src/year2022/day017.rs
+++ b/aoc/src/year2022/day017.rs
--- a/aoc/src/year2022/day018.rs
+++ b/aoc/src/year2022/day018.rs
--- a/aoc/src/year2022/day019.rs
+++ b/aoc/src/year2022/day019.rs
--- a/aoc/src/year2022/day020.rs
+++ b/aoc/src/year2022/day020.rs
--- a/aoc/src/year2022/day021.rs
+++ b/aoc/src/year2022/day021.rs
--- a/aoc/src/year2022/day022.rs
+++ b/aoc/src/year2022/day022.rs
--- a/aoc/src/year2022/day023.rs
+++ b/aoc/src/year2022/day023.rs
--- a/aoc/src/year2022/day024.rs
+++ b/aoc/src/year2022/day024.rs
--- a/aoc/src/year2022/day025.rs
+++ b/aoc/src/year2022/day025.rs
--- a/aoc/src/year2022/mod.rs
+++ b/aoc/src/year2022/mod.rs
--- a/aoc22-clap/Cargo.toml
+++ b/aoc22-clap/Cargo.toml
@ -0,0 +1,9 @@
+[package]
+name = "aoc22-clap"
+version = "2022.1.0"
+edition = "2021"
+
+
+[dependencies]
+clap = { version = "4.0.29", features = ["derive"] }
+aoc = {path= "../aoc"}
--- a/aoc22-clap/src/cli/mod.rs
+++ b/aoc22-clap/src/cli/mod.rs
@ -1,6 +1,5 @@
-mod commands;
 use clap::{arg, Parser, Subcommand};
-use commands::*;
+use aoc::*;
 //use std::ffi::OsString;
 use std::path::PathBuf;

--- a/aoc22-clap/src/main.rs
+++ b/aoc22-clap/src/main.rs
@ -1,4 +1,3 @@
-pub mod util;
 mod cli;

 use cli::execute_cli;