Allow unquoted block expressions

colin-kiegel · Feb 7, 2024 · 19ac1ea · 19ac1ea
1 parent d6cc48b
commit 19ac1ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/derive_builder/tests/builder_field_custom.rs b/derive_builder/tests/builder_field_custom.rs
@@ -7,10 +7,10 @@ use std::num::ParseIntError;
 
 #[derive(Debug, PartialEq, Default, Builder, Clone)]
 pub struct Lorem {
-    #[builder(field(ty = "Option<usize>", build = "self.ipsum.unwrap_or(42) + 1"))]
+    #[builder(field(ty = "Option<usize>", build = self.ipsum.unwrap_or(42) + 1))]
     ipsum: usize,
 
-    #[builder(setter(into), field(ty = "String", build = "self.dolor.parse()?"))]
+    #[builder(setter(into), field(ty = "String", build = self.dolor.parse()?))]
     dolor: u32,
 }
 

diff --git a/derive_builder_core/src/block.rs b/derive_builder_core/src/block.rs
@@ -61,6 +61,14 @@ impl darling::FromMeta for BlockContents {
             Err(darling::Error::unexpected_lit_type(value))
         }
     }
+
+    fn from_expr(expr: &syn::Expr) -> darling::Result<Self> {
+        if let syn::Expr::Lit(lit) = expr {
+            Self::from_value(&lit.lit)
+        } else {
+            Ok(Self::from(expr.clone()))
+        }
+    }
 }
 
 #[cfg(test)]