Merge pull request #28 from eZioPan/make_array-err

let "MakeArray" print item name on error
embassy-rs · Feb 25, 2024 · 0c421dc · 0c421dc
2 parents 3875f77 + 26cb1f1
commit 0c421dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/transform/make_field_array.rs b/src/transform/make_field_array.rs
@@ -1,3 +1,4 @@
+use anyhow::bail;
 use log::*;
 use serde::{Deserialize, Serialize};
 
@@ -42,7 +43,7 @@ impl MakeFieldArray {
                         .any(|i| matches!(i.bit_offset, BitOffset::Cursed(_)));
 
                     if has_regular_bit_offset && has_cursed_bit_offset {
-                        panic!("arrayize: items cannot mix bit_offset type")
+                        bail!("arrayize: items {} cannot mix bit_offset type", to)
                     }
                 }
 
@@ -58,7 +59,7 @@ impl MakeFieldArray {
                     calc_array(items.iter().map(|x| x.bit_offset.min_offset()).collect());
                 if let Array::Cursed(_) = &array {
                     if !self.allow_cursed {
-                        panic!("arrayize: items are not evenly spaced. Set `allow_cursed: true` to allow this.")
+                        bail!("arrayize: items {} are not evenly spaced. Set `allow_cursed: true` to allow this.", to)
                     }
                 }
 

diff --git a/src/transform/make_register_array.rs b/src/transform/make_register_array.rs
@@ -1,3 +1,4 @@
+use anyhow::bail;
 use log::*;
 use serde::{Deserialize, Serialize};
 
@@ -41,7 +42,7 @@ impl MakeRegisterArray {
                 let (offset, array) = calc_array(items.iter().map(|x| x.byte_offset).collect());
                 if let Array::Cursed(_) = &array {
                     if !self.allow_cursed {
-                        panic!("arrayize: items are not evenly spaced. Set `allow_cursed: true` to allow this.")
+                        bail!("arrayize: items {} are not evenly spaced. Set `allow_cursed: true` to allow this.", to);
                     }
                 }