From 7cba183debcf2cefd90b4c1e7a630fb0c2152d06 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sat, 5 Aug 2023 11:51:26 +0200 Subject: (semi-)proper error handling in matroska --- ebml_derive/src/lib.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ebml_derive/src') diff --git a/ebml_derive/src/lib.rs b/ebml_derive/src/lib.rs index 18a43a9..5836747 100644 --- a/ebml_derive/src/lib.rs +++ b/ebml_derive/src/lib.rs @@ -119,16 +119,16 @@ pub fn define_ebml(ts: TokenStream) -> TokenStream { pub fn id(&self) -> u64 { match self { #(#id_match),* } } - pub fn is_master(id: u64) -> anyhow::Result { - Ok(match id { #(#is_master_match),*, _ => anyhow::bail!("unknown id") }) + pub fn is_master(id: u64) -> crate::Result { + Ok(match id { #(#is_master_match),*, _ => return Err(crate::Error::UnknownID) }) } - pub fn construct_master(id: u64, kind: Master) -> anyhow::Result { - Ok(match id { #(#cons_master_match),*, _ => anyhow::bail!("unknown id") }) + pub fn construct_master(id: u64, kind: Master) -> crate::Result { + Ok(match id { #(#cons_master_match),*, _ => return Err(crate::Error::UnknownID) }) } - pub fn parse(id: u64, data: &[u8]) -> anyhow::Result { - Ok(match id { #(#parse_match),*, _ => anyhow::bail!("unknown id or master") }) + pub fn parse(id: u64, data: &[u8]) -> crate::Result { + Ok(match id { #(#parse_match),*, _ => return Err(crate::Error::UnknownID) }) } - pub fn write(&self, w: &mut Vec) -> anyhow::Result<()> { + pub fn write(&self, w: &mut Vec) -> crate::Result<()> { match self { #(#write_match),* } } } -- cgit v1.2.3-70-g09d2