rename serde de (conflicts with local)

src/bng/score.rs

@@ -19,17 +19,17 @@ use nom::{
 #[cfg(debug_assertions)]
 use serde::Serialize;
 use serde::{
-    de::{self, Visitor},
+    de::{self as serde_de, Visitor},
     Deserialize,
 };
 use strum::EnumDiscriminants;
 use thiserror::Error;
 use utils::{inflate, InflateError};
 
+mod de;
 mod lex;
-mod serialize;
 mod utils;
-pub use serialize::*;
+pub use de::*;
 
 use super::Expression as Instruction;
 

src/bng/score/de.rs

@@ -1,7 +1,23 @@
-use de::Deserializer;
-use nom::Parser;
+use derive_new::new;
+use nom::{
+    character::complete::one_of,
+    combinator::all_consuming,
+    multi::many0,
+    sequence::{preceded, terminated},
+    Parser,
+};
+use serde::{
+    de::{self, Deserializer, Visitor},
+    Deserialize,
+};
+use thiserror::Error;
 
-use super::*;
+use crate::bng::score::lex::lexer::flat_atom_parser;
+
+use super::{
+    utils::{inflate, InflateError},
+    Atoms, FlatAtom,
+};
 
 #[derive(Debug, Error)]
 enum AtomsSerializeError {