fix: handle raw identifier struct field (#14)

raiden-rs · Apr 1, 2022 · be5ead2 · be5ead2
1 parent 619e8b5
commit be5ead2
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 55 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/safe-builder-derive/Cargo.toml b/safe-builder-derive/Cargo.toml
@@ -12,6 +12,6 @@ proc-macro = true
 [dependencies]
 quote = "^1.0"
 proc-quote = "0.3.2"
-syn = "^1.0"
+syn = { version = "^1.0", features = ["parsing"] }
 proc-macro2 = "^1.0"
 convert_case = "^0.4.0"
diff --git a/safe-builder-derive/src/expander.rs b/safe-builder-derive/src/expander.rs
@@ -1,9 +1,10 @@
 use convert_case::*;
 use quote::*;
 use syn::*;
+use syn::ext::IdentExt;
 
 fn create_field_type(ident: &Ident) -> Ident {
-    let name = ident.to_string().to_case(Case::Pascal);
+    let name = ident.unraw().to_string().to_case(Case::Pascal);
     format_ident!("{}Type", name)
 }
 

diff --git a/safe-builder/tests/all/mod.rs b/safe-builder/tests/all/mod.rs
@@ -41,4 +41,24 @@ mod tests {
             foo
         )
     }
+
+    #[derive(Builder, PartialEq, Debug)]
+    pub struct RawIdentifier {
+        id: String,
+        r#type: String,
+    }
+    #[test]
+    fn raw_identifier_test() {
+        let raw_ident = RawIdentifier::builder()
+            .id("1234".to_owned())
+            .r#type("type".to_owned())
+            .build();
+        assert_eq!(
+            RawIdentifier {
+                id: "1234".to_owned(),
+                r#type: "type".to_owned(),
+            },
+            raw_ident
+        )
+    }
 }