Auto merge of #4478 - tsurai:master, r=flip1995

[rust.git] / tests / ui / derive.stderr

diff --git a/tests/ui/derive.stderr b/tests/ui/derive.stderr
index ffeed948ba55c6eea704aa069d4af62d9baa7c8d..875018961090714a64f3c55161333715fb308d51 100644 (file)
--- a/tests/ui/derive.stderr
+++ b/tests/ui/derive.stderr
@@ -1,109 +1,129 @@
 error: you are deriving `Hash` but have implemented `PartialEq` explicitly
-  --> $DIR/derive.rs:17:10
+  --> $DIR/derive.rs:16:10
    |
-17 | #[derive(Hash)]
+LL | #[derive(Hash)]
    |          ^^^^
    |
-   = note: `-D derive-hash-xor-eq` implied by `-D warnings`
+   = note: `#[deny(clippy::derive_hash_xor_eq)]` on by default
 note: `PartialEq` implemented here
-  --> $DIR/derive.rs:20:1
+  --> $DIR/derive.rs:19:1
    |
-20 | / impl PartialEq for Bar {
-21 | |     fn eq(&self, _: &Bar) -> bool { true }
-22 | | }
+LL | / impl PartialEq for Bar {
+LL | |     fn eq(&self, _: &Bar) -> bool {
+LL | |         true
+LL | |     }
+LL | | }
    | |_^
 
 error: you are deriving `Hash` but have implemented `PartialEq` explicitly
-  --> $DIR/derive.rs:24:10
+  --> $DIR/derive.rs:25:10
    |
-24 | #[derive(Hash)]
+LL | #[derive(Hash)]
    |          ^^^^
    |
 note: `PartialEq` implemented here
-  --> $DIR/derive.rs:27:1
+  --> $DIR/derive.rs:28:1
    |
-27 | / impl PartialEq<Baz> for Baz {
-28 | |     fn eq(&self, _: &Baz) -> bool { true }
-29 | | }
+LL | / impl PartialEq<Baz> for Baz {
+LL | |     fn eq(&self, _: &Baz) -> bool {
+LL | |         true
+LL | |     }
+LL | | }
    | |_^
 
 error: you are implementing `Hash` explicitly but have derived `PartialEq`
-  --> $DIR/derive.rs:34:1
+  --> $DIR/derive.rs:37:1
    |
-34 | / impl Hash for Bah {
-35 | |     fn hash<H: Hasher>(&self, _: &mut H) {}
-36 | | }
+LL | / impl Hash for Bah {
+LL | |     fn hash<H: Hasher>(&self, _: &mut H) {}
+LL | | }
    | |_^
    |
 note: `PartialEq` implemented here
-  --> $DIR/derive.rs:31:10
+  --> $DIR/derive.rs:34:10
    |
-31 | #[derive(PartialEq)]
+LL | #[derive(PartialEq)]
    |          ^^^^^^^^^
 
 error: you are implementing `Clone` explicitly on a `Copy` type
-  --> $DIR/derive.rs:41:1
+  --> $DIR/derive.rs:44:1
    |
-41 | / impl Clone for Qux {
-42 | |     fn clone(&self) -> Self { Qux }
-43 | | }
+LL | / impl Clone for Qux {
+LL | |     fn clone(&self) -> Self {
+LL | |         Qux
+LL | |     }
+LL | | }
    | |_^
    |
-   = note: `-D expl-impl-clone-on-copy` implied by `-D warnings`
+   = note: `-D clippy::expl-impl-clone-on-copy` implied by `-D warnings`
 note: consider deriving `Clone` or removing `Copy`
-  --> $DIR/derive.rs:41:1
+  --> $DIR/derive.rs:44:1
    |
-41 | / impl Clone for Qux {
-42 | |     fn clone(&self) -> Self { Qux }
-43 | | }
+LL | / impl Clone for Qux {
+LL | |     fn clone(&self) -> Self {
+LL | |         Qux
+LL | |     }
+LL | | }
    | |_^
 
 error: you are implementing `Clone` explicitly on a `Copy` type
-  --> $DIR/derive.rs:65:1
+  --> $DIR/derive.rs:68:1
    |
-65 | / impl<'a> Clone for Lt<'a> {
-66 | |     fn clone(&self) -> Self { unimplemented!() }
-67 | | }
+LL | / impl<'a> Clone for Lt<'a> {
+LL | |     fn clone(&self) -> Self {
+LL | |         unimplemented!()
+LL | |     }
+LL | | }
    | |_^
    |
 note: consider deriving `Clone` or removing `Copy`
-  --> $DIR/derive.rs:65:1
+  --> $DIR/derive.rs:68:1
    |
-65 | / impl<'a> Clone for Lt<'a> {
-66 | |     fn clone(&self) -> Self { unimplemented!() }
-67 | | }
+LL | / impl<'a> Clone for Lt<'a> {
+LL | |     fn clone(&self) -> Self {
+LL | |         unimplemented!()
+LL | |     }
+LL | | }
    | |_^
 
 error: you are implementing `Clone` explicitly on a `Copy` type
-  --> $DIR/derive.rs:75:1
+  --> $DIR/derive.rs:80:1
    |
-75 | / impl Clone for BigArray {
-76 | |     fn clone(&self) -> Self { unimplemented!() }
-77 | | }
+LL | / impl Clone for BigArray {
+LL | |     fn clone(&self) -> Self {
+LL | |         unimplemented!()
+LL | |     }
+LL | | }
    | |_^
    |
 note: consider deriving `Clone` or removing `Copy`
-  --> $DIR/derive.rs:75:1
+  --> $DIR/derive.rs:80:1
    |
-75 | / impl Clone for BigArray {
-76 | |     fn clone(&self) -> Self { unimplemented!() }
-77 | | }
+LL | / impl Clone for BigArray {
+LL | |     fn clone(&self) -> Self {
+LL | |         unimplemented!()
+LL | |     }
+LL | | }
    | |_^
 
 error: you are implementing `Clone` explicitly on a `Copy` type
-  --> $DIR/derive.rs:85:1
+  --> $DIR/derive.rs:92:1
    |
-85 | / impl Clone for FnPtr {
-86 | |     fn clone(&self) -> Self { unimplemented!() }
-87 | | }
+LL | / impl Clone for FnPtr {
+LL | |     fn clone(&self) -> Self {
+LL | |         unimplemented!()
+LL | |     }
+LL | | }
    | |_^
    |
 note: consider deriving `Clone` or removing `Copy`
-  --> $DIR/derive.rs:85:1
+  --> $DIR/derive.rs:92:1
    |
-85 | / impl Clone for FnPtr {
-86 | |     fn clone(&self) -> Self { unimplemented!() }
-87 | | }
+LL | / impl Clone for FnPtr {
+LL | |     fn clone(&self) -> Self {
+LL | |         unimplemented!()
+LL | |     }
+LL | | }
    | |_^
 
 error: aborting due to 7 previous errors