Derive Eq for types that already derive PartialEq

ramosbugs · Feb 29, 2024 · 898ead2 · 898ead2
1 parent 3a801c9
commit 898ead2
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git a/src/core/mod.rs b/src/core/mod.rs
@@ -428,7 +428,7 @@ new_type![
     ///
     /// OpenID Connect Core claim name.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     CoreClaimName(String)
 ];
 impl ClaimName for CoreClaimName {}
@@ -557,7 +557,7 @@ new_type![
     ///
     /// OpenID Connect Core gender claim.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     CoreGenderClaim(String)
 ];
 impl GenderClaim for CoreGenderClaim {}

diff --git a/src/jwt.rs b/src/jwt.rs
@@ -13,12 +13,12 @@ use std::ops::Deref;
 use std::str;
 
 new_type![
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     JsonWebTokenContentType(String)
 ];
 
 new_type![
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     JsonWebTokenType(String)
 ];
 

diff --git a/src/macros.rs b/src/macros.rs
@@ -121,7 +121,7 @@ macro_rules! new_type {
         }
     ) => {
         $(#[$attr])*
-        #[derive(Clone, Debug, PartialEq)]
+        #[derive(Clone, Debug, PartialEq, Eq)]
         pub struct $name(
             $(#[$type_attr])*
             $type
@@ -155,7 +155,7 @@ macro_rules! new_type {
         }
     ) => {
         $(#[$attr])*
-        #[derive(Clone, Debug, PartialEq)]
+        #[derive(Clone, Debug, PartialEq, Eq)]
         pub(crate) struct $name(
             $(#[$type_attr])*
             $type

diff --git a/src/types.rs b/src/types.rs
@@ -412,7 +412,7 @@ new_type![
     /// Set of authentication methods or procedures that are considered to be equivalent to each
     /// other in a particular context.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     AuthenticationContextClass(String)
 ];
 impl AsRef<str> for AuthenticationContextClass {
@@ -427,15 +427,15 @@ new_type![
     ///
     /// Defining specific AMR identifiers is beyond the scope of the OpenID Connect Core spec.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     AuthenticationMethodReference(String)
 ];
 
 new_type![
     ///
     /// Access token hash.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     AccessTokenHash(String)
     impl {
         ///
@@ -464,47 +464,47 @@ new_type![
     ///
     /// Country portion of address.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     AddressCountry(String)
 ];
 
 new_type![
     ///
     /// Locality portion of address.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     AddressLocality(String)
 ];
 
 new_type![
     ///
     /// Postal code portion of address.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     AddressPostalCode(String)
 ];
 
 new_type![
     ///
     /// Region portion of address.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     AddressRegion(String)
 ];
 
 new_type![
     ///
     /// Audience claim value.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     Audience(String)
 ];
 
 new_type![
     ///
     /// Authorization code hash.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     AuthorizationCodeHash(String)
     impl {
         ///
@@ -531,7 +531,7 @@ new_type![
 ];
 
 new_type![
-    #[derive(Deserialize, Eq, Hash, Serialize)]
+    #[derive(Deserialize, Hash, Serialize)]
     pub(crate) Base64UrlEncodedBytes(
         #[serde(with = "serde_base64url_byte_array")]
         Vec<u8>
@@ -542,7 +542,7 @@ new_type![
     ///
     /// OpenID Connect client name.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     ClientName(String)
 ];
 
@@ -564,7 +564,7 @@ new_type![
     ///
     /// Client contact e-mail address.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     ClientContactEmail(String)
 ];
 
@@ -586,79 +586,79 @@ new_type![
     /// providing just year can result in varying month and day, so the implementers need to take
     /// this factor into account to correctly process the dates.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserBirthday(String)
 ];
 
 new_type![
     ///
     /// End user's e-mail address.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserEmail(String)
 ];
 
 new_type![
     ///
     /// End user's family name.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserFamilyName(String)
 ];
 
 new_type![
     ///
     /// End user's given name.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserGivenName(String)
 ];
 
 new_type![
     ///
     /// End user's middle name.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserMiddleName(String)
 ];
 
 new_type![
     ///
     /// End user's name.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserName(String)
 ];
 
 new_type![
     ///
     /// End user's nickname.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserNickname(String)
 ];
 
 new_type![
     ///
     /// End user's phone number.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserPhoneNumber(String)
 ];
 
 new_type![
     ///
     /// URL of end user's profile picture.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserPictureUrl(String)
 ];
 
 new_type![
     ///
     /// URL of end user's profile page.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserProfileUrl(String)
 ];
 
@@ -667,23 +667,23 @@ new_type![
     /// End user's time zone as a string from the
     /// [time zone database](https://www.iana.org/time-zones).
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserTimezone(String)
 ];
 
 new_type![
     ///
     /// URL of end user's website.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserWebsiteUrl(String)
 ];
 
 new_type![
     ///
     /// End user's username.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     EndUserUsername(String)
 ];
 
@@ -695,7 +695,7 @@ new_type![
     /// either as a carriage return/line feed pair (`"\r\n"`) or as a single line feed character
     /// (`"\n"`).
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     FormattedAddress(String)
 ];
 
@@ -733,7 +733,7 @@ new_type![
     ///
     /// ID of a JSON Web Key.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     JsonWebKeyId(String)
 ];
 
@@ -951,7 +951,7 @@ new_type![
     ///
     /// Language tag adhering to RFC 5646 (e.g., `fr` or `fr-CA`).
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     LanguageTag(String)
 ];
 impl AsRef<str> for LanguageTag {
@@ -1170,7 +1170,7 @@ new_type![
     /// separated by newlines. Newlines can be represented either as a carriage return/line feed
     /// pair (`\r\n`) or as a single line feed character (`\n`).
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     StreetAddress(String)
 ];
 
@@ -1179,7 +1179,7 @@ new_type![
     /// Locally unique and never reassigned identifier within the Issuer for the End-User, which is
     /// intended to be consumed by the client application.
     ///
-    #[derive(Deserialize, Eq, Hash, Ord, PartialOrd, Serialize)]
+    #[derive(Deserialize, Hash, Ord, PartialOrd, Serialize)]
     SubjectIdentifier(String)
 ];