Merge pull request #1 from DasEtwas/patch-1

Improve error messages

Author: swiftcoder

spirv_struct_layout/Cargo.toml

@@ -12,4 +12,4 @@ readme = "../README.md"
 
 [dependencies]
 spirv-struct-layout-derive = { version = "0.1", path = "../spirv_struct_layout_derive" }
-spirq = "0.2"
+spirq = "0.4"

spirv_struct_layout_derive/src/lib.rs

@@ -23,9 +23,9 @@ pub fn spirv_layout_derive(input: proc_macro::TokenStream) -> proc_macro::TokenS
                 #repr_check
 
                 let spv: spirq::SpirvBinary = spirv.into();
-                let entries = spv.reflect().unwrap();
+                let entries = spv.reflect().expect("Failed to parse SPIR-V");
 
-                let buffer_desc = entries[0].resolve_desc(spirq::sym::Sym::new(name)).unwrap();
+                let buffer_desc = entries[0].resolve_desc(spirq::sym::Sym::new(name)).expect(format!("Failed to find symbol with name \"{}\"", name).as_str());
 
                 let mut _rust_offset = 0;
 
@@ -64,7 +64,7 @@ fn build_function_body(data: &Data) -> TokenStream {
 
                                 if let Some(desc) = buffer_desc.desc_ty.resolve(spirq::sym::Sym::new(&symbol)) {
                                     let spirv_offset = desc.offset;
-                                    let spirv_size = desc.ty.nbyte().unwrap();
+                                    let spirv_size = desc.ty.nbyte().expect(format!("Rust struct field named \"{}\" does not have a basic data type (float, vec, mat, array, struct) as a SPIR-V counterpart", &symbol).as_str());
 
                                     assert_eq!(
                                         spirv_size, rust_size,