add option to skip Default impl on struct

saber-hq · Jul 27, 2022 · 3cdb734 · 3cdb734
1 parent 8b04272
commit 3cdb734
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/crates/anchor-idl/src/program.rs b/crates/anchor-idl/src/program.rs
@@ -20,6 +20,8 @@ pub struct GeneratorOptions {
     pub zero_copy: Option<PathList>,
     /// List of `repr(packed)` structs.
     pub packed: Option<PathList>,
+    /// List of structs that should have `Default` impl skipped.
+    pub skip_default: Option<PathList>,
 }
 
 fn path_list_to_string(list: Option<&PathList>) -> HashSet<String> {
@@ -40,15 +42,23 @@ impl GeneratorOptions {
 
         let zero_copy = path_list_to_string(self.zero_copy.as_ref());
         let packed = path_list_to_string(self.packed.as_ref());
+        let skip_default = path_list_to_string(self.skip_default.as_ref());
+
+        let mut all_structs: HashSet<String> = HashSet::new();
+        for struct_item in [&zero_copy, &packed, &skip_default].into_iter().flatten() {
+            if !all_structs.contains(struct_item) {
+                all_structs.insert(struct_item.clone());
+            }
+        }
 
         let mut struct_opts: BTreeMap<String, StructOpts> = BTreeMap::new();
-        let all_structs: HashSet<&String> = zero_copy.union(&packed).collect::<HashSet<_>>();
-        all_structs.into_iter().for_each(|name| {
+        all_structs.iter().for_each(|name| {
             struct_opts.insert(
                 name.to_string(),
                 StructOpts {
                     zero_copy: zero_copy.contains(name),
                     packed: packed.contains(name),
+                    skip_default: skip_default.contains(name),
                 },
             );
         });
@@ -61,6 +71,7 @@ impl GeneratorOptions {
 pub struct StructOpts {
     pub packed: bool,
     pub zero_copy: bool,
+    pub skip_default: bool,
 }
 
 pub struct Generator {

diff --git a/crates/anchor-idl/src/typedef.rs b/crates/anchor-idl/src/typedef.rs
@@ -142,7 +142,7 @@ pub fn generate_struct(
     let fields_rendered = generate_fields(fields);
     let props = get_field_list_properties(defs, fields);
 
-    let derive_default = if props.can_derive_default {
+    let derive_default = if props.can_derive_default && !opts.skip_default {
         quote! {
             #[derive(Default)]
         }

diff --git a/examples/whirlpools/src/lib.rs b/examples/whirlpools/src/lib.rs
@@ -10,7 +10,8 @@
 anchor_gen::generate_cpi_interface!(
     idl_path = "idl.json",
     zero_copy(TickArray, Tick),
-    packed(TickArray, Tick)
+    packed(TickArray, Tick),
+    skip_default(WhirlpoolBumps)
 );
 
 impl Default for state::TickArray {
@@ -23,4 +24,12 @@ impl Default for state::TickArray {
     }
 }
 
+impl Default for WhirlpoolBumps {
+    fn default() -> Self {
+        Self {
+            whirlpool_bump: Default::default(),
+        }
+    }
+}
+
 declare_id!("whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc");