Merge commit '7ea7cd165ad6705603852771bf82cc2fd6560db5' into clippyup2

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

diff --git a/tests/ui/new_without_default.stderr b/tests/ui/new_without_default.stderr
index e2b10894af8db084ac8405010c66e2ef360705cd..e529e441eb735c6b60cb59d5090fa5a22763bfdb 100644 (file)
--- a/tests/ui/new_without_default.stderr
+++ b/tests/ui/new_without_default.stderr
@@ -1,47 +1,71 @@
-error: you should consider deriving a `Default` implementation for `Foo`
-  --> $DIR/new_without_default.rs:13:5
+error: you should consider adding a `Default` implementation for `Foo`
+  --> $DIR/new_without_default.rs:8:5
    |
-13 |     pub fn new() -> Foo { Foo }
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | /     pub fn new() -> Foo {
+LL | |         Foo
+LL | |     }
+   | |_____^
    |
-note: lint level defined here
-  --> $DIR/new_without_default.rs:5:30
-   |
-5  | #![deny(new_without_default, new_without_default_derive)]
-   |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: `-D clippy::new-without-default` implied by `-D warnings`
 help: try this
-   | #[derive(Default)]
-   | pub struct Foo;
+   |
+LL | impl Default for Foo {
+LL |     fn default() -> Self {
+LL |         Self::new()
+LL |     }
+LL | }
+   |
 
-error: you should consider deriving a `Default` implementation for `Bar`
-  --> $DIR/new_without_default.rs:23:5
+error: you should consider adding a `Default` implementation for `Bar`
+  --> $DIR/new_without_default.rs:16:5
    |
-23 |     pub fn new() -> Self { Bar }
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | /     pub fn new() -> Self {
+LL | |         Bar
+LL | |     }
+   | |_____^
    |
 help: try this
-   | #[derive(Default)]
-   | pub struct Bar;
+   |
+LL | impl Default for Bar {
+LL |     fn default() -> Self {
+LL |         Self::new()
+LL |     }
+LL | }
+   |
 
 error: you should consider adding a `Default` implementation for `LtKo<'c>`
-  --> $DIR/new_without_default.rs:72:5
+  --> $DIR/new_without_default.rs:80:5
+   |
+LL | /     pub fn new() -> LtKo<'c> {
+LL | |         unimplemented!()
+LL | |     }
+   | |_____^
    |
-72 |     pub fn new() -> LtKo<'c> { unimplemented!() }
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: try this
+   |
+LL | impl Default for LtKo<'c> {
+LL |     fn default() -> Self {
+LL |         Self::new()
+LL |     }
+LL | }
+   |
+
+error: you should consider adding a `Default` implementation for `NewNotEqualToDerive`
+  --> $DIR/new_without_default.rs:157:5
    |
-note: lint level defined here
-  --> $DIR/new_without_default.rs:5:9
+LL | /     pub fn new() -> Self {
+LL | |         NewNotEqualToDerive { foo: 1 }
+LL | |     }
+   | |_____^
    |
-5  | #![deny(new_without_default, new_without_default_derive)]
-   |         ^^^^^^^^^^^^^^^^^^^
 help: try this
-   |     impl Default for LtKo<'c> {
-   |         fn default() -> Self {
-   |             Self::new()
-   |         }
-   |     }
-   | 
-...
+   |
+LL | impl Default for NewNotEqualToDerive {
+LL |     fn default() -> Self {
+LL |         Self::new()
+LL |     }
+LL | }
+   |
 
-error: aborting due to 3 previous errors
+error: aborting due to 4 previous errors