Big breaking refactoring of the old code into multiple files.

Author: drdozer

Cargo.toml

@@ -2,7 +2,7 @@
 name = "e2rs"
 version = "0.1.0"
 edition = "2021"
-author = "turingatemyhamster@gmail.com"
+authors = ["turingatemyhamster@gmail.com"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,8 +17,6 @@ path = "src/bin/test_main.rs"
 [[bin]]
 name = "render_solution"
 path = "src/bin/render_solution.rs"
-author = "turingatemyhamster@gmail.com"
-version = "0.1.0"
 
 [dependencies]
 clap = { version = "4.1.1", features = ["derive"] }

src/bin/render_solution.rs

@@ -1,4 +1,9 @@
-use std::{io::{BufReader, Read}, fs::File};
+#![feature(is_some_and)]
+
+use std::{
+    fs::File,
+    io::{BufReader, Read},
+};
 
 use clap::Parser;
 use e2rs::{e2::E2_BOARD_SPEC, images::board_image};
@@ -12,8 +17,7 @@ struct Cli {
     /// file to write the board image to
     image: std::path::PathBuf,
     /// set the rotation direction to clockwise (default anti-clockwise)
-    #[arg(default_value_t = false)]
-    clockwise: bool,
+    clockwise: Option<bool>,
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -23,8 +27,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut solution_txt = String::new();
     solution.read_to_string(&mut solution_txt)?;
 
-    let clues = E2_BOARD_SPEC.tiles.parse_clues(solution_txt.as_str(), args.clockwise);
-    let mut board = E2_BOARD_SPEC.dimensions.unwrap().new_board();
+    let clues = E2_BOARD_SPEC
+        .parse_clues(solution_txt.as_str(), args.clockwise.is_some_and(|b| b));
+    let mut board = E2_BOARD_SPEC.dimensions.new_board();
 
     for clue in clues {
         clue.apply(&mut board);
@@ -34,4 +39,4 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     img.save(args.image)?;
 
     Ok(())
-}
+}

src/bin/test_main.rs

@@ -1,15 +1,20 @@
 //! Eternity 2-family puzzles.
 
+use rand::{
+    distributions::{Slice, Uniform},
+    prelude::Distribution,
+};
 
-use rand::{distributions::{Slice, Uniform}, prelude::Distribution};
-
-use e2rs::{board::{Clue, ROTATIONS, Indx}, e2::{self, E2_CLUES}, images::{board_image}};
-
+use e2rs::{
+    model::{Clue, Indx, ROTATIONS, Rotate},
+    e2::{self, E2_CLUES},
+    images::board_image,
+};
 
 fn main() {
     let spec = e2::board_spec();
     let tiles = &spec.tiles;
-    let dims = spec.dimensions.unwrap();
+    let dims = &spec.dimensions;
 
     println!("Loaded tiles.");
     for (i, t) in tiles.into_iter().enumerate() {
@@ -26,7 +31,7 @@ fn main() {
 
     let mut rng = rand::thread_rng();
     let r_tile = Slice::new(&tiles[..]).unwrap().map(Clone::clone);
-    let r_col= Uniform::new(0, dims.columns);
+    let r_col = Uniform::new(0, dims.columns);
     let r_row = Uniform::new(0, dims.rows);
     let r_rot = Slice::new(&ROTATIONS).unwrap().map(Clone::clone);
 
@@ -37,7 +42,10 @@ fn main() {
         let clue = Clue {
             tile: r_tile.sample(&mut rng),
             rotation: r_rot.sample(&mut rng),
-            at: Indx { col: r_col.sample(&mut rng), row: r_row.sample(&mut rng) }
+            at: Indx {
+                col: r_col.sample(&mut rng),
+                row: r_row.sample(&mut rng),
+            },
         };
         println!("Applying clue: {:?}", clue);