chore: manual merge

johnstonskj · Jul 19, 2024 · eadd524 · RemiBardon · Jul 25, 2024 · johnstonskj
1 parent 0cd4782
commit eadd524
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "email_address"
-version = "0.2.5"
+version = "0.2.6"
 authors = ["Simon Johnston <[email protected]>"]
 description = "A Rust crate providing an implementation of an RFC-compliant `EmailAddress` newtype. "
 documentation = "https://docs.rs/email_address/"

diff --git a/README.md b/README.md
@@ -59,6 +59,10 @@ assert_eq!(
 
 ## Changes
 
+### Version 0.2.6
+
+- Fix: merge issues.
+
 ### Version 0.2.5
 
 * Feature: Pull Request #15 -- Potential enhancement to add any free-text as

diff --git a/src/lib.rs b/src/lib.rs
@@ -354,7 +354,7 @@ impl Default for Options {
 /// create an instance. The various components of the email _are not_ parsed out to be accessible
 /// independently.
 ///
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone)]
 pub struct EmailAddress(String);
 
 // ------------------------------------------------------------------------------------------------
@@ -1589,6 +1589,7 @@ mod tests {
             Deserializer::builder(assert_ok!(email.serialize(&serializer))).build();
 
         assert_ok_eq!(EmailAddress::deserialize(&mut deserializer), email);
+    }
 
     #[test]
     // Regression test: GitHub issue #11