De-duplicate searching for skippable traits

Author: daxpedda

src/attr/default.rs

@@ -30,7 +30,7 @@ impl Default {
 				let mut impl_default = false;
 
 				for derive_where in derive_wheres {
-					if derive_where.trait_(Trait::Default).is_some() {
+					if derive_where.trait_(&Trait::Default).is_some() {
 						impl_default = true;
 						break;
 					}

src/attr/item.rs

@@ -7,8 +7,8 @@ use syn::{
 	parse::{discouraged::Speculative, Parse, ParseStream},
 	punctuated::Punctuated,
 	spanned::Spanned,
-	Attribute, Data, Ident, Meta, NestedMeta, Path, PredicateType, Result, Token, TraitBound, Type,
-	TypeParamBound, TypePath, WhereClause, WherePredicate,
+	Attribute, Data, Ident, Meta, NestedMeta, Path, PredicateType, Result, Token, TraitBound,
+	TraitBoundModifier, Type, TypeParamBound, TypePath, WhereClause, WherePredicate,
 };
 
 use crate::{util, Error, Item, Skip, Trait, TraitImpl, DERIVE_WHERE};
@@ -175,10 +175,10 @@ impl DeriveWhere {
 	}
 
 	/// Returns selected [`DeriveTrait`] if present.
-	pub fn trait_(&self, trait_: Trait) -> Option<&DeriveTrait> {
+	pub fn trait_(&self, trait_: &Trait) -> Option<&DeriveTrait> {
 		self.traits
 			.iter()
-			.find(|derive_trait| ***derive_trait == trait_)
+			.find(|derive_trait| &***derive_trait == trait_)
 	}
 
 	/// Returns `true` if any [`CustomBound`](Generic::CustomBound) is present.
@@ -203,6 +203,11 @@ impl DeriveWhere {
 		})
 	}
 
+	/// Returns `true` if any [`Trait`] supports skipping.
+	pub fn any_skip(&self) -> bool {
+		self.traits.iter().any(|trait_| trait_.supports_skip())
+	}
+
 	/// Create [`WhereClause`] for the given parameters.
 	pub fn where_clause(
 		&self,
@@ -386,11 +391,12 @@ impl DeriveTrait {
 
 		list.push(TypeParamBound::Trait(TraitBound {
 			paren_token: None,
-			modifier: syn::TraitBoundModifier::None,
+			modifier: TraitBoundModifier::None,
 			lifetimes: None,
 			path: self.path(),
 		}));
 
+		// Add bounds specific to the trait.
 		if let Some(bound) = self.additional_where_bounds(data) {
 			list.push(bound)
 		}

src/attr/skip.rs

@@ -61,12 +61,10 @@ impl Skip {
 						Some(Skip::None) | Some(Skip::Traits(..)) | None => {
 							// Don't allow to skip all traits if no trait to be implemented supports
 							// skipping.
-							if derive_wheres.iter().any(|derive_where| {
-								derive_where
-									.traits
-									.iter()
-									.any(|trait_| trait_.supports_skip())
-							}) {
+							if derive_wheres
+								.iter()
+								.any(|derive_where| derive_where.any_skip())
+							{
 								*self = Skip::All;
 								Ok(())
 							} else {
@@ -133,10 +131,7 @@ impl Skip {
 									_ => {
 										// Don't allow to skip trait that isn't being implemented.
 										if derive_wheres.iter().any(|derive_where| {
-											derive_where
-												.traits
-												.iter()
-												.any(|derive_trait| **derive_trait == trait_)
+											derive_where.trait_(&trait_).is_some()
 										}) {
 											traits.push(trait_)
 										} else {

src/attr/zeroize_fqs.rs

@@ -19,7 +19,7 @@ impl ZeroizeFqs {
 
 		if !derive_wheres
 			.iter()
-			.any(|derive_where| derive_where.trait_(Trait::Zeroize).is_some())
+			.any(|derive_where| derive_where.trait_(&Trait::Zeroize).is_some())
 		{
 			return Err(Error::zeroize(meta.span()));
 		}

src/input.rs

@@ -83,7 +83,7 @@ impl<'a> Input<'a> {
 				if !accumulated_defaults.0
 					&& derive_wheres
 						.iter()
-						.any(|derive_where| derive_where.trait_(Trait::Default).is_some())
+						.any(|derive_where| derive_where.trait_(&Trait::Default).is_some())
 				{
 					return Err(Error::default_missing(span));
 				}
@@ -118,7 +118,7 @@ impl<'a> Input<'a> {
 				{
 					if let Some(DeriveTrait::Zeroize {
 						crate_: Some(_), ..
-					}) = derive_where.trait_(Trait::Zeroize)
+					}) = derive_where.trait_(&Trait::Zeroize)
 					{
 						true
 					} else {
@@ -180,7 +180,7 @@ impl<'a> Input<'a> {
 			let mut found_use_case = false;
 			// `Default` is used on an enum.
 			found_use_case |= match item {
-				Item::Enum { .. } => derive_where.trait_(Trait::Default).is_some(),
+				Item::Enum { .. } => derive_where.trait_(&Trait::Default).is_some(),
 				Item::Item(_) => false,
 			};
 			// Any field is skipped with a corresponding `Trait`.
@@ -196,7 +196,7 @@ impl<'a> Input<'a> {
 					{
 						if let Some(DeriveTrait::Zeroize {
 							crate_: Some(_), ..
-						}) = derive_where.trait_(Trait::Zeroize)
+						}) = derive_where.trait_(&Trait::Zeroize)
 						{
 							true
 						} else {
@@ -205,7 +205,7 @@ impl<'a> Input<'a> {
 					}
 				};
 				// `Zeroize(fqs)` is used on any field.
-				found_use_case |= derive_where.trait_(Trait::Zeroize).is_some() && item.any_fqs();
+				found_use_case |= derive_where.trait_(&Trait::Zeroize).is_some() && item.any_fqs();
 			}
 
 			if !found_use_case {

src/item.rs

@@ -50,7 +50,7 @@ impl Item<'_> {
 		match self {
 			Item::Enum { .. } => derive_wheres
 				.iter()
-				.any(|derive_where| derive_where.trait_(Trait::Default).is_some()),
+				.any(|derive_where| derive_where.trait_(&Trait::Default).is_some()),
 			_ => false,
 		}
 	}