Merge remote-tracking branch 'origin/main' into develop

Expurple · Mar 4, 2021 · 209bf9e · 209bf9e
2 parents cf8c1da + 5273d4c
commit 209bf9e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sanitizer-macros/Cargo.toml b/sanitizer-macros/Cargo.toml
@@ -1,6 +1,10 @@
 [package]
 name = "sanitizer_macros"
+<<<<<<< HEAD
 version = "0.1.3"
+=======
+version = "0.1.2"
+>>>>>>> origin/main
 edition = "2018"
 authors = ["weegee <[email protected]>"]
 license = "MIT"

diff --git a/sanitizer-macros/src/lib.rs b/sanitizer-macros/src/lib.rs
@@ -92,7 +92,13 @@ pub fn sanitize(input: TokenStream) -> TokenStream {
                     if val.is_enum() {
                         init_enum(&mut init, field, x, &mut call);
                     } else {
+<<<<<<< HEAD
                         init_struct(&mut init, field, x, &mut call);
+=======
+                        init.append_all(quote! {
+                            let mut instance = IntSanitizer::from(self.#x);
+                        })
+>>>>>>> origin/main
                     }
                 }
                 TypeOrNested::Nested(x, y) => {