From a82579dfa525ec3f94d0a49ddd7ea74cae4bcade Mon Sep 17 00:00:00 2001 From: p6nj Date: Thu, 31 Oct 2024 00:24:37 -0400 Subject: [PATCH] serialize everything --- src/bng/score.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bng/score.rs b/src/bng/score.rs index 4202844..fa58350 100644 --- a/src/bng/score.rs +++ b/src/bng/score.rs @@ -46,13 +46,13 @@ impl<'de> Deserialize<'de> for Atoms { Sheet, } #[derive(Deserialize, new)] - struct NotesSheet<'a> { - notes: &'a str, - sheet: &'a str, + struct NotesSheet { + notes: String, + sheet: String, } struct NotesSheetVisitor; impl<'de> Visitor<'de> for NotesSheetVisitor { - type Value = NotesSheet<'de>; + type Value = NotesSheet; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { formatter.write_str("a \"notes\" field and a \"sheet\" field") } @@ -98,7 +98,7 @@ impl<'de> Deserialize<'de> for Atoms { const FIELDS: &[&str] = &["notes", "sheet"]; let NotesSheet { notes, sheet } = deserializer.deserialize_struct("NotesSheet", FIELDS, NotesSheetVisitor)?; - many0(flat_atom_parser(notes))(sheet) + let x = many0(flat_atom_parser(¬es))(&sheet) .map_err(|e| e.to_string()) .map_err(AtomsSerializeError::Parsing) .map_err(de::Error::custom) @@ -107,7 +107,8 @@ impl<'de> Deserialize<'de> for Atoms { .map_err(AtomsSerializeError::from) .map_err(de::Error::custom) }) - .map(Atoms) + .map(Atoms); + x } }