Added Display and FromStr impl for Bpp.

tools/Cargo.lock

@@ -279,9 +279,12 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "convert_case"
-version = "0.4.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
 
 [[package]]
 name = "core-foundation-sys"
@@ -572,6 +575,7 @@ dependencies = [
  "anyhow",
  "byteorder",
  "ddw3-bytes",
+ "derive_more",
  "image",
  "itertools 0.11.0",
  "pathdiff",
@@ -693,15 +697,24 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.17"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version",
- "syn 1.0.109",
+ "syn 2.0.72",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -1377,15 +1390,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.15"
@@ -1418,12 +1422,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
-
 [[package]]
 name = "serde"
 version = "1.0.204"
@@ -1750,6 +1748,18 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
 [[package]]
 name = "unsafe-libyaml"
 version = "0.2.11"

tools/Cargo.toml

@@ -61,7 +61,7 @@ bytemuck = "1.13.1"
 byteorder = "1.4.3"
 clap = { version = "4.4.1", features = ["derive"] }
 clap-num = "1.1.1"
-derive_more = "0.99.17"
+derive_more = "1.0.0"
 either = "1.9.0"
 extend = "1.2.0"
 goblin = "0.7.1"

tools/ddw3-tim/Cargo.toml

@@ -8,6 +8,7 @@ version = "0.1.0"
 anyhow = { workspace = true }
 byteorder = { workspace = true }
 ddw3-bytes = { workspace = true }
+derive_more = { workspace = true, features = ["full"] }
 image = { workspace = true }
 itertools = { workspace = true }
 pathdiff = { workspace = true }

tools/ddw3-tim/src/header.rs

@@ -24,10 +24,18 @@ impl TimHeader {
 /// Bits per pixel
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
 #[derive(serde::Serialize, serde::Deserialize)]
+#[derive(derive_more::Display, derive_more::FromStr)]
 pub enum Bpp {
+	#[display("indexed4")]
 	Indexed4,
+
+	#[display("indexed8")]
 	Indexed8,
+
+	#[display("color16")]
 	Color16,
+
+	#[display("color24")]
 	Color24,
 }