Merge pull request #286 from chanced/issue_284

Adds a check for `strip_option` when using `try_setter`

derive_builder/CHANGELOG.md

@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased] - 2023-07-25
+- Make try-setters inherit `strip_option` from `setter` for `try_setter`. Using these settings together previously caused a compile error  #284
+
 ## [0.13.0] - 2023-07-24
 - Bump MSRV to 1.56.0
 

derive_builder/tests/setter_custom.rs

@@ -1,3 +1,5 @@
+use std::convert::TryInto;
+
 #[macro_use]
 extern crate pretty_assertions;
 #[macro_use]
@@ -16,6 +18,8 @@ struct SetterCustom {
     setter_custom_with_explicit_default: u32,
     #[builder(setter(custom = "true", strip_option))]
     setter_custom_with_strip_option: Option<u32>,
+    #[builder(try_setter, setter(custom = "true", strip_option))]
+    setter_custom_with_strip_option_try_setter: Option<u32>,
 }
 
 // compile test
@@ -44,6 +48,19 @@ impl SetterCustomBuilder {
         self.setter_custom_with_strip_option = Some(Some(6));
         self
     }
+    fn setter_custom_with_strip_option_try_setter(&mut self) -> &mut Self {
+        self.setter_custom_with_strip_option_try_setter = Some(Some(32));
+        self
+    }
+}
+
+struct TryIntoU32 {}
+impl TryInto<u32> for TryIntoU32 {
+    type Error = ();
+
+    fn try_into(self) -> Result<u32, Self::Error> {
+        Ok(32)
+    }
 }
 
 #[test]
@@ -58,6 +75,7 @@ fn setter_custom_defaults() {
             setter_custom_by_explicit_opt_out: 0,
             setter_custom_with_explicit_default: 4,
             setter_custom_with_strip_option: None,
+            setter_custom_with_strip_option_try_setter: None
         }
     );
 }
@@ -70,6 +88,7 @@ fn setter_custom_setters_called() {
         .setter_custom_by_explicit_opt_out(42)
         .setter_custom_with_explicit_default() // set to 43
         .setter_custom_with_strip_option() // set to 6
+        .setter_custom_with_strip_option_try_setter() // set to 32
         .build()
         .unwrap();
 
@@ -80,7 +99,8 @@ fn setter_custom_setters_called() {
             setter_custom_shorthand: 2,
             setter_custom_by_explicit_opt_out: 42,
             setter_custom_with_explicit_default: 43,
-            setter_custom_with_strip_option: Some(6)
+            setter_custom_with_strip_option: Some(6),
+            setter_custom_with_strip_option_try_setter: Some(32)
         }
     );
 }

derive_builder/tests/try_setter.rs

@@ -85,3 +85,9 @@ fn renamed() {
         .build()
         .expect("All fields were provided");
 }
+
+#[derive(Debug, PartialEq, Builder)]
+#[builder(try_setter, setter(into, strip_option))]
+struct MaybeIpsum {
+    pub source: Option<MyAddr>,
+}

derive_builder_core/src/setter.rs

@@ -163,6 +163,9 @@ impl<'a> ToTokens for Setter<'a> {
                 if builder_field_is_option {
                     converted = wrap_expression_in_some(crate_root, converted);
                 }
+                if stripped_option {
+                    converted = wrap_expression_in_some(crate_root, converted);
+                }
 
                 tokens.append_all(quote!(
                     #(#attrs)*
@@ -463,6 +466,44 @@ mod tests {
             .to_string()
         );
     }
+    #[test]
+    fn strip_option_try_setter() {
+        let ty = parse_quote!(Option<Foo>);
+        let mut setter = default_setter!();
+        setter.strip_option = true;
+        setter.try_setter = true;
+        setter.generic_into = true;
+        setter.field_type = BuilderFieldType::Optional(&ty);
+        #[rustfmt::skip]
+        assert_eq!(
+            quote!(#setter).to_string(),
+            quote!(
+                #[allow(unused_mut)]
+                pub fn foo<VALUE: ::db::export::core::convert::Into<Foo>>(
+                    &mut self,
+                    value: VALUE
+                ) -> &mut Self {
+                    let mut new = self;
+                    new.foo = ::db::export::core::option::Option::Some(
+                        ::db::export::core::option::Option::Some(value.into())
+                    );
+                    new
+                }
+                pub fn try_foo<VALUE: ::db::export::core::convert::TryInto<Foo>>(
+                    &mut self,
+                    value: VALUE
+                ) -> ::db::export::core::result::Result<&mut Self, VALUE::Error> {
+                    let converted: Foo = value.try_into()?;
+                    let mut new = self;
+                    new.foo = ::db::export::core::option::Option::Some(
+                        ::db::export::core::option::Option::Some(converted)
+                    );
+                    Ok(new)
+                }
+            )
+            .to_string()
+        );
+    }
 
     // including try_setter
     #[test]