From d79383a7dff9c79754846e5713160acfb18fc7c1 Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Tue, 23 Jan 2024 12:40:25 +0100
Subject: [PATCH] cleanup: remove unneeded source format in read instruction

The image crate is able to infer the format, so that data is redundant
---
 crates/eval/src/kind/debug/instr/mod.rs | 2 +-
 crates/ir/src/instruction/read.rs       | 7 -------
 testfiles/bare.ron                      | 1 -
 testfiles/invert.ron                    | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/crates/eval/src/kind/debug/instr/mod.rs b/crates/eval/src/kind/debug/instr/mod.rs
index 14afac8..77e4101 100644
--- a/crates/eval/src/kind/debug/instr/mod.rs
+++ b/crates/eval/src/kind/debug/instr/mod.rs
@@ -2,7 +2,7 @@ pub mod read {
     use image::{io::Reader as ImageReader, DynamicImage};
     use ir::instruction::read::{Read, SourceType};
 
-    pub fn read(Read { source, .. }: Read) -> DynamicImage {
+    pub fn read(Read { source }: Read) -> DynamicImage {
         // TODO: actual error handling
         let img = ImageReader::open(match source {
             SourceType::File(path) => path,
diff --git a/crates/ir/src/instruction/read.rs b/crates/ir/src/instruction/read.rs
index dfb2275..2e4ab60 100644
--- a/crates/ir/src/instruction/read.rs
+++ b/crates/ir/src/instruction/read.rs
@@ -4,16 +4,9 @@ use std::path::PathBuf;
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct Read {
     pub source: SourceType,
-    pub format: SourceFormat,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub enum SourceType {
     File(PathBuf),
 }
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub enum SourceFormat {
-    Jpeg,
-    Png,
-}
diff --git a/testfiles/bare.ron b/testfiles/bare.ron
index de78944..66565bf 100644
--- a/testfiles/bare.ron
+++ b/testfiles/bare.ron
@@ -2,7 +2,6 @@
 	instructions: {
 		0: Read((
 			source: File("testfiles/rails.png"),
-			format: Png,
 		)),
 		1: Write((
 			target: File("testfiles/gen/out.jpg"),
diff --git a/testfiles/invert.ron b/testfiles/invert.ron
index ce8e68d..575ad1d 100644
--- a/testfiles/invert.ron
+++ b/testfiles/invert.ron
@@ -2,7 +2,6 @@
 	instructions: {
 		0: Read((
 			source: File("testfiles/rails.png"),
-			format: Png,
 		)),
 		1: Filter(Invert),
 		2: Write((