small nits

Author: fredszaq

CHANGELOG.md

@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Add `Hash` derive similar to `std`'s one, but considering generics correctly,
   and supporting custom hash functions per field or skipping fields.
   ([#532](https://github.com/JelteF/derive_more/pull/532))
-- Add support for custom eq functions in `PartialEq` derive.
+- Add support for custom eq functions in `PartialEq`/`Eq` derive.
   ([#535](https://github.com/JelteF/derive_more/pull/535))
 
 ### Fixed

impl/doc/eq.md

@@ -289,7 +289,7 @@ impl PartialEq for Enum {
 
 ### Custom comparison with `with`
 
-Both `#[eq(with(...))]` and  `#[partial_eq(with(...))]` attribute allows specifying a custom comparison function
+Both `#[eq(with(...))]` and `#[partial_eq(with(...))]` attributes allows specifying a custom comparison function
 for a field. The function must have the signature `fn(&T, &T) -> bool` where `T` is the field type.
 
 ```rust
@@ -340,4 +340,4 @@ impl PartialEq for Foo {
         }
     }
 }
-```
+```

impl/src/cmp/partial_eq.rs

@@ -215,8 +215,7 @@ impl StructuralExpansion<'_> {
                                 let maybe_not = (!eq).then(|| quote! {!});
                                 quote! { #maybe_not #eq_fn(#self_val, #other_val) }
                             }
-                            ).unwrap_or_else(||
-                            quote! { #self_val #cmp #other_val }
+                            ).unwrap_or_else(|| quote! { #self_val #cmp #other_val }
                         );
                         punctuated::Pair::Punctuated(equality, &chain)
                     })

tests/compile_fail/partial_eq/unknown_with_function.rs

@@ -1,18 +1,15 @@
 #[derive(derive_more::PartialEq)]
 struct Foo(#[partial_eq(with(unknown))] i32);
 
-fn incompatible_types(a:& str) ->i32 {0}
+fn incompatible_types(_a: &str) ->i32 {0}
 
 #[derive(derive_more::PartialEq)]
 struct Bar(#[partial_eq(with(incompatible_types))] i32);
 
-
 #[derive(derive_more::PartialEq)]
 enum Enum {
     Bar { #[partial_eq(with(unknown))] i: i32 },
     Baz { #[partial_eq(with(incompatible_types))] i: i32 },
 }
 
-
-
 fn main() {}

tests/compile_fail/partial_eq/unknown_with_function.stderr

@@ -20,8 +20,8 @@ error[E0061]: this function takes 1 argument but 2 arguments were supplied
 note: function defined here
  --> tests/compile_fail/partial_eq/unknown_with_function.rs:4:4
   |
-4 | fn incompatible_types(a:& str) ->i32 {0}
-  |    ^^^^^^^^^^^^^^^^^^ -------
+4 | fn incompatible_types(_a: &str) ->i32 {0}
+  |    ^^^^^^^^^^^^^^^^^^ --------
 
 error[E0308]: mismatched types
  --> tests/compile_fail/partial_eq/unknown_with_function.rs:6:10
@@ -35,46 +35,38 @@ error[E0308]: mismatched types
   = note: this error originates in the derive macro `derive_more::PartialEq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find function `unknown` in this scope
-  --> tests/compile_fail/partial_eq/unknown_with_function.rs:12:29
+  --> tests/compile_fail/partial_eq/unknown_with_function.rs:11:29
    |
-12 |     Bar { #[partial_eq(with(unknown))] i: i32 },
+11 |     Bar { #[partial_eq(with(unknown))] i: i32 },
    |                             ^^^^^^^ not found in this scope
 
 error[E0061]: this function takes 1 argument but 2 arguments were supplied
-  --> tests/compile_fail/partial_eq/unknown_with_function.rs:13:29
+  --> tests/compile_fail/partial_eq/unknown_with_function.rs:12:29
    |
-10 | #[derive(derive_more::PartialEq)]
+ 9 | #[derive(derive_more::PartialEq)]
    |          ----------------------
    |          |
    |          expected `&str`, found `&i32`
    |          unexpected argument #2 of type `&i32`
 ...
-13 |     Baz { #[partial_eq(with(incompatible_types))] i: i32 },
+12 |     Baz { #[partial_eq(with(incompatible_types))] i: i32 },
    |                             ^^^^^^^^^^^^^^^^^^
    |
    = note: expected reference `&str`
               found reference `&i32`
 note: function defined here
   --> tests/compile_fail/partial_eq/unknown_with_function.rs:4:4
    |
- 4 | fn incompatible_types(a:& str) ->i32 {0}
-   |    ^^^^^^^^^^^^^^^^^^ -------
+ 4 | fn incompatible_types(_a: &str) ->i32 {0}
+   |    ^^^^^^^^^^^^^^^^^^ --------
 
 error[E0308]: mismatched types
-  --> tests/compile_fail/partial_eq/unknown_with_function.rs:10:10
-   |
-10 | #[derive(derive_more::PartialEq)]
-   |          ^^^^^^^^^^^^^^^^^^^^^^
-   |          |
-   |          expected `bool`, found `i32`
-   |          expected `bool` because of return type
-   |
-   = note: this error originates in the derive macro `derive_more::PartialEq` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-warning: unused variable: `a`
- --> tests/compile_fail/partial_eq/unknown_with_function.rs:4:23
+ --> tests/compile_fail/partial_eq/unknown_with_function.rs:9:10
   |
-4 | fn incompatible_types(a:& str) ->i32 {0}
-  |                       ^ help: if this is intentional, prefix it with an underscore: `_a`
+9 | #[derive(derive_more::PartialEq)]
+  |          ^^^^^^^^^^^^^^^^^^^^^^
+  |          |
+  |          expected `bool`, found `i32`
+  |          expected `bool` because of return type
   |
-  = note: `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default
+  = note: this error originates in the derive macro `derive_more::PartialEq` (in Nightly builds, run with -Z macro-backtrace for more info)