Use a bound method instead of a free function for param search

impl/src/as/mod.rs

@@ -15,9 +15,7 @@ use syn::{
     Token,
 };
 
-use crate::utils::{
-    contains_any_of, forward, skip, Either, HashSet, ParamSearch, Spanning,
-};
+use crate::utils::{forward, skip, Either, HashSet, ParamSearch, Spanning};
 
 /// Expands an [`AsRef`]/[`AsMut`] derive macro.
 pub fn expand(
@@ -212,7 +210,7 @@ impl<'a> ToTokens for Expansion<'a> {
             param_consts,
         };
 
-        let field_contains_param = contains_any_of(field_ty, &param_search);
+        let field_contains_param = param_search.any_in(field_ty);
 
         let is_blanket = matches!(&self.args, Some(AsArgs::Forward(_)));
 
@@ -248,7 +246,7 @@ impl<'a> ToTokens for Expansion<'a> {
                     break 'ver Direct;
                 }
 
-                if field_contains_param || contains_any_of(&return_ty, &param_search) {
+                if field_contains_param || param_search.any_in(&return_ty) {
                     break 'ver Forwarded;
                 }
 

impl/src/utils.rs

@@ -32,7 +32,7 @@ pub(crate) use self::fields_ext::FieldsExt;
 pub(crate) use self::spanning::Spanning;
 
 #[cfg(feature = "as_ref")]
-pub(crate) use self::param_search::{contains_any_of, ParamSearch};
+pub(crate) use self::param_search::ParamSearch;
 
 #[derive(Clone, Copy, Default)]
 pub struct DeterministicState;
@@ -1697,6 +1697,17 @@ mod param_search {
         pub param_consts: HashSet<&'a syn::Ident>,
     }
 
+    impl<'a> ParamSearch<'a> {
+        pub(crate) fn any_in(&self, ty: &syn::Type) -> bool {
+            let mut visitor = TypeSearchVisitor {
+                search: self,
+                found: false,
+            };
+            visitor.visit_type(ty);
+            visitor.found
+        }
+    }
+
     struct TypeSearchVisitor<'a> {
         search: &'a ParamSearch<'a>,
         found: bool,
@@ -1739,14 +1750,4 @@ mod param_search {
             syn::visit::visit_expr_path(self, ep)
         }
     }
-
-    pub(crate) fn contains_any_of(ty: &syn::Type, search: &ParamSearch<'_>) -> bool {
-        let mut visitor = TypeSearchVisitor {
-            search,
-            found: false,
-        };
-
-        visitor.visit_type(ty);
-        visitor.found
-    }
 }