Unify strip_option and strip_bool parsing with `apply_potentialy_…

…empty_sub_to_field`
idanarye · Aug 22, 2024 · bafa343 · bafa343
1 parent 0d8a9c3
commit bafa343
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 67 deletions.
diff --git a/typed-builder-macro/src/field_info.rs b/typed-builder-macro/src/field_info.rs
@@ -336,74 +336,13 @@ impl ApplyMeta for SetterSettings {
             "skip" => expr.apply_flag_to_field(&mut self.skip, "skipped"),
             "into" => expr.apply_flag_to_field(&mut self.auto_into, "calling into() on the argument"),
             "strip_option" => {
-                let caption = "putting the argument in Some(...)";
-
-                match expr {
-                    AttrArg::Sub(sub) => {
-                        let span = sub.span();
-
-                        if self.strip_option.is_none() {
-                            let mut strip_option = Strip::new(span);
-                            strip_option.apply_sub_attr(sub)?;
-                            self.strip_option = Some(strip_option);
-
-                            Ok(())
-                        } else {
-                            Err(Error::new(span, format!("Illegal setting - field is already {caption}")))
-                        }
-                    }
-                    AttrArg::Flag(flag) => {
-                        if self.strip_option.is_none() {
-                            self.strip_option = Some(Strip::new(flag.span()));
-                            Ok(())
-                        } else {
-                            Err(Error::new(
-                                flag.span(),
-                                format!("Illegal setting - field is already {caption}"),
-                            ))
-                        }
-                    }
-                    AttrArg::Not { .. } => {
-                        self.strip_option = None;
-                        Ok(())
-                    }
-                    _ => Err(expr.incorrect_type()),
-                }
-            }
-            "strip_bool" => {
-                let caption = "zero arguments setter, sets the field to true";
-
-                match expr {
-                    AttrArg::Sub(sub) => {
-                        let span = sub.span();
-
-                        if self.strip_bool.is_none() {
-                            let mut strip_bool = Strip::new(span);
-                            strip_bool.apply_sub_attr(sub)?;
-                            self.strip_bool = Some(strip_bool);
-                            Ok(())
-                        } else {
-                            Err(Error::new(span, format!("Illegal setting - field is already {caption}")))
-                        }
-                    }
-                    AttrArg::Flag(flag) => {
-                        if self.strip_bool.is_none() {
-                            self.strip_bool = Some(Strip::new(flag.span()));
-                            Ok(())
-                        } else {
-                            Err(Error::new(
-                                flag.span(),
-                                format!("Illegal setting - field is already {caption}"),
-                            ))
-                        }
-                    }
-                    AttrArg::Not { .. } => {
-                        self.strip_bool = None;
-                        Ok(())
-                    }
-                    _ => Err(expr.incorrect_type()),
-                }
+                expr.apply_potentialy_empty_sub_to_field(&mut self.strip_option, "putting the argument in Some(...)", Strip::new)
             }
+            "strip_bool" => expr.apply_potentialy_empty_sub_to_field(
+                &mut self.strip_bool,
+                "zero arguments setter, sets the field to true",
+                Strip::new,
+            ),
             _ => Err(Error::new_spanned(
                 expr.name(),
                 format!("Unknown parameter {:?}", expr.name().to_string()),

diff --git a/typed-builder-macro/src/util.rs b/typed-builder-macro/src/util.rs
@@ -189,6 +189,45 @@ impl AttrArg {
             _ => Err(self.incorrect_type()),
         }
     }
+
+    pub fn apply_potentialy_empty_sub_to_field<T: ApplyMeta>(
+        self,
+        field: &mut Option<T>,
+        caption: &str,
+        init: impl FnOnce(Span) -> T,
+    ) -> syn::Result<()> {
+        match self {
+            AttrArg::Sub(sub) => {
+                if field.is_none() {
+                    let mut value = init(sub.span());
+                    value.apply_sub_attr(sub)?;
+                    *field = Some(value);
+                    Ok(())
+                } else {
+                    Err(Error::new(
+                        sub.span(),
+                        format!("Illegal setting - field is already {caption}"),
+                    ))
+                }
+            }
+            AttrArg::Flag(flag) => {
+                if field.is_none() {
+                    *field = Some(init(flag.span()));
+                    Ok(())
+                } else {
+                    Err(Error::new(
+                        flag.span(),
+                        format!("Illegal setting - field is already {caption}"),
+                    ))
+                }
+            }
+            AttrArg::Not { .. } => {
+                *field = None;
+                Ok(())
+            }
+            _ => Err(self.incorrect_type()),
+        }
+    }
 }
 
 pub struct KeyValue {