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((