Merge pull request #223 from rruckley/bug-macro-hasnote-222

Bug: Macro hasNote Trait

tmflib-derive/Cargo.toml

@@ -1,6 +1,8 @@
+[workspace]
+
 [package]
 name = "tmflib-derive"
-version = "0.1.29"
+version = "0.1.30"
 edition = "2021"
 authors = ["Ryan Ruckley <[email protected]>"]
 description = "Derive macro for the tmflib::HasId trait"
@@ -11,6 +13,6 @@ repository = "https://github.com/rruckley/tmflib"
 proc-macro = true
 
 [dependencies]
-proc-macro2 = "1.0.92"
+proc-macro2 = "1.0.93"
 quote = "1.0.38"
-syn = "2.0.95"
+syn = "2.0.96"

tmflib-derive/src/lib.rs

@@ -212,13 +212,22 @@ pub fn hasnote_derive(input: TokenStream) -> TokenStream {
     let out = quote! {
         impl HasNote for #name {
             fn add_note(&mut self, note : Note) {
-                self.note.as_mut().unwrap().push(note);    
+                match self.note.as_mut() {
+                    Some(v) => v.push(note),
+                    None => self.note = Some(vec![note]),
+                }  
             }
             fn get_note(&self, idx : usize) -> Option<&Note> {
-                self.note.as_ref().unwrap().get(idx)
+                match self.note.as_ref() {
+                    Some(n) => n.get(idx),
+                    None => None,
+                }
             }
             fn remove_note(&mut self, idx: usize) -> Result<Note,String> {
-                Ok(self.note.as_mut().unwrap().remove(idx))  
+                match self.note.as_mut() {
+                    Some(n) => Ok(n.remove(idx)),
+                    None => Err(String::from("No notes present")),
+                }  
             }
         }
     };