Merge pull request #41 from Grinkers/fix-serialize+circulardep

Fix serialize+circulardep

Cargo.toml

@@ -23,7 +23,7 @@ path = "tests/progress.rs"
 syn = "1.0"
 quote = "1.0"
 proc-macro2 = "1.0"
-edn-rs = "0.16.6"
+edn-rs = { git = "https://github.com/edn-rs/edn-rs.git" } # TODO lock in version once stable
 
 [dev-dependencies]
 trybuild = { version = "1.0", features = ["diff"] }

src/serialize.rs

@@ -56,14 +56,10 @@ fn expand_unnamed_struct(struct_name: &Ident, fields: &Punctuated<Field, Comma>)
         }
     });
 
-    let str_struct_name = edn::camel_to_kebab(&quote! {#struct_name}.to_string());
-
     quote! {
         impl edn_rs::Serialize for #struct_name {
             fn serialize(self) -> std::string::String {
-                let mut s = std::string::String::from(':');
-                s.push_str(#str_struct_name);
-                s.push_str("{ ");
+                let mut s = std::string::String::from("{ ");
                 #(s.push_str(&#it);)*
                 s.push_str("}");
                 s

tests/unnamed_struct_deserialize.rs

@@ -14,7 +14,7 @@ enum Kind {
 pub struct Person(String, usize, Kind);
 
 fn main() -> Result<(), EdnError> {
-    let edn_person = ":person{ 0 \"joana\", 1 290000, 2 :kind/pirate, }";
+    let edn_person = "{ 0 \"joana\", 1 290000, 2 :kind/pirate, }";
 
     let person: Person = edn_rs::from_str(edn_person)?;
 

tests/unnamed_struct_serialize.rs

@@ -15,7 +15,7 @@ fn main() {
 
     assert_eq!(
         edn_rs::to_string(person),
-        ":person{ 0 \"joana\", 1 290000, 2 :kind/chill, }"
+        "{ 0 \"joana\", 1 290000, 2 :kind/chill, }"
     );
 }