Skip to content

Commit b046006

Browse files
committed
style: Strictly follow syn's rebinding idiom
https://docs.rs/syn/latest/syn/enum.Expr.html#syntax-tree-enums
1 parent 712fe93 commit b046006

File tree

2 files changed

+18
-21
lines changed

2 files changed

+18
-21
lines changed

src/gen.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ impl<'a> FnIngredient<'a> {
122122
.iter()
123123
.filter_map(|arg| match arg {
124124
syn::FnArg::Receiver(_) => None,
125-
syn::FnArg::Typed(pat_type) => {
126-
let syn::Pat::Ident(ident) = pat_type.pat.as_ref() else {
125+
syn::FnArg::Typed(arg) => {
126+
let syn::Pat::Ident(ident) = arg.pat.as_ref() else {
127127
panic!("Pat should be an ident in function declaration position.");
128128
};
129129
Some(ident)
@@ -185,10 +185,8 @@ fn gen_impl_fn(
185185
}
186186

187187
match item {
188-
syn::Item::Enum(enum_) => gen_impl_fn_enum(generic_param_replacer, enum_, &fn_ingredient),
189-
syn::Item::Struct(struct_) => {
190-
gen_impl_fn_struct(generic_param_replacer, struct_, &fn_ingredient)
191-
}
188+
syn::Item::Enum(item) => gen_impl_fn_enum(generic_param_replacer, item, &fn_ingredient),
189+
syn::Item::Struct(item) => gen_impl_fn_struct(generic_param_replacer, item, &fn_ingredient),
192190
_ => Err(syn::Error::new(
193191
item.span(),
194192
"expected `enum ...` or `struct ...`",

src/lib.rs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,9 @@ fn external_trait_def_aux(args: TokenStream, item: TokenStream) -> syn::Result<T
265265
for mut item in &mut content.1 {
266266
#[allow(clippy::single_match)]
267267
match &mut item {
268-
syn::Item::Use(use_) => {
269-
use_.attrs.push(parse_quote! { #[allow(unused)] });
270-
uses.push(use_.clone());
268+
syn::Item::Use(item) => {
269+
item.attrs.push(parse_quote! { #[allow(unused)] });
270+
uses.push(item.clone());
271271
}
272272
_ => {}
273273
}
@@ -281,17 +281,17 @@ fn external_trait_def_aux(args: TokenStream, item: TokenStream) -> syn::Result<T
281281
for item in &mut content.1 {
282282
#[allow(clippy::single_match)]
283283
match item {
284-
syn::Item::Trait(ref mut trait_) => {
284+
syn::Item::Trait(ref mut item) => {
285285
let attr = parse_quote! {
286286
#[::thin_delegate::__internal__is_external_marker]
287287
};
288-
trait_.attrs.push(attr);
288+
item.attrs.push(attr);
289289

290290
if let Some(uses) = &uses {
291291
let attr = parse_quote! {
292292
#[::thin_delegate::__internal__with_uses(#uses)]
293293
};
294-
trait_.attrs.push(attr);
294+
item.attrs.push(attr);
295295
}
296296
}
297297
_ => {}
@@ -342,30 +342,29 @@ fn register_aux(args: TokenStream, item: TokenStream) -> syn::Result<TokenStream
342342
)
343343
})?;
344344
let is_external = match &item {
345-
syn::Item::Trait(trait_) => {
345+
syn::Item::Trait(item) => {
346346
#[allow(non_snake_case)]
347347
let __internal__is_external_marker: syn::Attribute = parse_quote! {
348348
#[::thin_delegate::__internal__is_external_marker]
349349
};
350-
trait_
351-
.attrs
350+
item.attrs
352351
.iter()
353352
.any(|attr| *attr == __internal__is_external_marker)
354353
}
355354
_ => false,
356355
};
357356
let macro_def = match &item {
358-
syn::Item::Trait(trait_) => {
359-
let trait_path = syn::Path::from(syn::PathSegment::from(trait_.ident.clone()));
357+
syn::Item::Trait(item) => {
358+
let trait_path = syn::Path::from(syn::PathSegment::from(item.ident.clone()));
360359
// Note that `args` and `trait_path` here are kinds of dummy. It's just used for validation.
361-
let trait_data = TraitData::new(&FillDelegateArgs::default(), trait_, trait_path);
360+
let trait_data = TraitData::new(&FillDelegateArgs::default(), item, trait_path);
362361
trait_data.validate()?;
363362

364363
decl_macro::define_macro_feed_trait_def_of(
365-
&trait_.ident,
366-
trait_.ident.span(),
364+
&item.ident,
365+
item.ident.span(),
367366
is_external,
368-
trait_,
367+
item,
369368
)
370369
}
371370
syn::Item::Struct(structenum) => decl_macro::define_macro_feed_structenum_def_of(

0 commit comments

Comments
 (0)