Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some missing syn invisible group handling in FromMeta implementations #263

Merged
merged 6 commits into from
Feb 12, 2024
Merged

Fix some missing syn invisible group handling in FromMeta implementations #263

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f68450c
Fix missing syn invisible group handling
Ten0 Feb 8, 2024
aecdfec
Add more missing syn invisible group handling
Ten0 Feb 8, 2024
93abc80
and fix another one
Ten0 Feb 8, 2024
b8fd3ce
Add coment on `Group` in `FromMeta`
Ten0 Feb 12, 2024
b3d68f0
fmt fix
Ten0 Feb 12, 2024
8b5134a
Refer to comment about Group in all relevant implementations
Ten0 Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 40 additions & 25 deletions core/src/from_meta.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,14 @@ pub trait FromMeta: Sized {
fn from_expr(expr: &Expr) -> Result<Self> {
match *expr {
Expr::Lit(ref lit) => Self::from_value(&lit.lit),
Expr::Group(ref group) => Self::from_expr(&group.expr),
Expr::Group(ref group) => {
// syn may generate this invisible group delimiter when the input to the darling
// proc macro (specifically, the attributes) are generated by a
// macro_rules! (e.g. propagating a macro_rules!'s expr)
// Since we want to basically ignore these invisible group delimiters,
// we just propagate the call to the inner expression.
Self::from_expr(&group.expr)
}
_ => Err(Error::unexpected_expr_type(expr)),
}
.map_err(|e| e.with_span(expr))
Expand Down Expand Up @@ -292,13 +299,14 @@ impl<T: syn::parse::Parse, P: syn::parse::Parse> FromMeta for syn::punctuated::P
/// alternate parsing modes for this type.
impl FromMeta for syn::Expr {
fn from_expr(expr: &Expr) -> Result<Self> {
if let syn::Expr::Lit(expr_lit) = expr {
if let syn::Lit::Str(_) = &expr_lit.lit {
return Self::from_value(&expr_lit.lit);
}
match expr {
Expr::Lit(syn::ExprLit {
lit: lit @ syn::Lit::Str(_),
..
}) => Self::from_value(lit),
Expr::Group(group) => Self::from_expr(&group.expr), // see FromMeta::from_expr
_ => Ok(expr.clone()),
}

Ok(expr.clone())
}

fn from_string(value: &str) -> Result<Self> {
Expand Down Expand Up @@ -333,6 +341,7 @@ impl FromMeta for syn::Path {
match expr {
Expr::Lit(lit) => Self::from_value(&lit.lit),
Expr::Path(path) => Ok(path.path.clone()),
Expr::Group(group) => Self::from_expr(&group.expr), // see FromMeta::from_expr
_ => Err(Error::unexpected_expr_type(expr)),
}
}
Expand Down Expand Up @@ -361,6 +370,7 @@ impl FromMeta for syn::Ident {
Some(ident) => Ok(ident.clone()),
None => Err(Error::unexpected_expr_type(expr)),
},
Expr::Group(group) => Self::from_expr(&group.expr), // see FromMeta::from_expr
_ => Err(Error::unexpected_expr_type(expr)),
}
}
Expand All @@ -380,12 +390,11 @@ macro_rules! from_syn_expr_type {
($ty:path, $variant:ident) => {
impl FromMeta for $ty {
fn from_expr(expr: &syn::Expr) -> Result<Self> {
if let syn::Expr::$variant(body) = expr {
Ok(body.clone())
} else if let syn::Expr::Lit(expr_lit) = expr {
Self::from_value(&expr_lit.lit)
} else {
Err(Error::unexpected_expr_type(expr))
match expr {
syn::Expr::$variant(body) => Ok(body.clone()),
syn::Expr::Lit(expr_lit) => Self::from_value(&expr_lit.lit),
syn::Expr::Group(group) => Self::from_expr(&group.expr), // see FromMeta::from_expr
_ => Err(Error::unexpected_expr_type(expr)),
}
}

Expand Down Expand Up @@ -452,21 +461,27 @@ macro_rules! from_numeric_array {
/// Parsing an unsigned integer array, i.e. `example = "[1, 2, 3, 4]"`.
impl FromMeta for Vec<$ty> {
fn from_expr(expr: &syn::Expr) -> Result<Self> {
if let syn::Expr::Array(expr_array) = expr {
let v = expr_array
match expr {
syn::Expr::Array(expr_array) => expr_array
.elems
.iter()
.map(|expr| match expr {
Expr::Lit(lit) => $ty::from_value(&lit.lit),
_ => Err(Error::custom("Expected array of unsigned integers")
.with_span(expr)),
.map(|expr| {
let unexpected = || {
Error::custom("Expected array of unsigned integers").with_span(expr)
};
match expr {
Expr::Lit(lit) => $ty::from_value(&lit.lit),
Expr::Group(group) => match &*group.expr {
Expr::Lit(lit) => $ty::from_value(&lit.lit),
_ => Err(unexpected()),
},
_ => Err(unexpected()),
}
})
.collect::<Result<Vec<$ty>>>();
v
} else if let syn::Expr::Lit(expr_lit) = expr {
Self::from_value(&expr_lit.lit)
} else {
Err(Error::unexpected_expr_type(expr))
.collect::<Result<Vec<$ty>>>(),
syn::Expr::Lit(expr_lit) => Self::from_value(&expr_lit.lit),
syn::Expr::Group(group) => Self::from_expr(&group.expr), // see FromMeta::from_expr
_ => Err(Error::unexpected_expr_type(expr)),
}
}

Expand Down