Fix clippy tests

Author: estebank

src/tools/clippy/tests/ui/derivable_impls.fixed

@@ -1,4 +1,4 @@
-#![allow(dead_code)]
+#![allow(dead_code, default_could_be_derived)]
 
 use std::collections::HashMap;
 

src/tools/clippy/tests/ui/derivable_impls.rs

@@ -1,4 +1,4 @@
-#![allow(dead_code)]
+#![allow(dead_code, default_could_be_derived)]
 
 use std::collections::HashMap;
 

src/tools/clippy/tests/ui/new_without_default.fixed

@@ -38,19 +38,14 @@ impl Bar {
     }
 }
 
-pub struct Ok;
+#[derive(Default)] pub struct Ok;
 
 impl Ok {
     pub fn new() -> Self {
         Ok
     }
 }
 
-impl Default for Ok {
-    fn default() -> Self {
-        Ok
-    }
-}
 
 pub struct Params;
 

src/tools/clippy/tests/ui/new_without_default.stderr

@@ -166,5 +166,23 @@ LL +     }
 LL + }
    |
 
-error: aborting due to 9 previous errors
+error: `impl Default` that could be derived
+  --> tests/ui/new_without_default.rs:37:1
+   |
+LL | / impl Default for Ok {
+LL | |     fn default() -> Self {
+LL | |         Ok
+   | |         -- this type has no fields, so it's trivially derivable
+LL | |     }
+LL | | }
+   | |_^
+   |
+   = note: `-D default-could-be-derived` implied by `-D warnings`
+   = help: to override `-D warnings` add `#[allow(default_could_be_derived)]`
+help: you don't need to manually `impl Default`, you can derive it
+   |
+LL ~ #[derive(Default)] pub struct Ok;
+   |
+
+error: aborting due to 10 previous errors
 

src/tools/clippy/tests/ui/or_fun_call.fixed

@@ -21,18 +21,14 @@ fn or_fun_call() {
         }
     }
 
-    struct FakeDefault;
+    #[derive(Default)] struct FakeDefault;
     impl FakeDefault {
         fn default() -> Self {
             FakeDefault
         }
     }
 
-    impl Default for FakeDefault {
-        fn default() -> Self {
-            FakeDefault
-        }
-    }
+    
 
     enum Enum {
         A(i32),
@@ -268,18 +264,14 @@ mod lazy {
             }
         }
 
-        struct FakeDefault;
+        #[derive(Default)] struct FakeDefault;
         impl FakeDefault {
             fn default() -> Self {
                 FakeDefault
             }
         }
 
-        impl Default for FakeDefault {
-            fn default() -> Self {
-                FakeDefault
-            }
-        }
+        
 
         let with_new = Some(vec![1]);
         with_new.unwrap_or_default();

src/tools/clippy/tests/ui/or_fun_call.stderr

@@ -244,5 +244,47 @@ error: function call inside of `unwrap_or`
 LL |     let _ = opt_foo.unwrap_or(Foo { val: String::default() });
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unwrap_or_else(|| Foo { val: String::default() })`
 
-error: aborting due to 38 previous errors
+error: `impl Default` that could be derived
+  --> tests/ui/or_fun_call.rs:31:5
+   |
+LL | /     impl Default for FakeDefault {
+LL | |         fn default() -> Self {
+LL | |             FakeDefault
+   | |             ----------- this type has no fields, so it's trivially derivable
+LL | |         }
+LL | |     }
+   | |_____^
+   |
+   = note: `-D default-could-be-derived` implied by `-D warnings`
+   = help: to override `-D warnings` add `#[allow(default_could_be_derived)]`
+help: you don't need to manually `impl Default`, you can derive it
+   |
+LL ~     #[derive(Default)] struct FakeDefault;
+LL |     impl FakeDefault {
+...
+LL |
+LL ~     
+   |
+
+error: `impl Default` that could be derived
+  --> tests/ui/or_fun_call.rs:278:9
+   |
+LL | /         impl Default for FakeDefault {
+LL | |             fn default() -> Self {
+LL | |                 FakeDefault
+   | |                 ----------- this type has no fields, so it's trivially derivable
+LL | |             }
+LL | |         }
+   | |_________^
+   |
+help: you don't need to manually `impl Default`, you can derive it
+   |
+LL ~         #[derive(Default)] struct FakeDefault;
+LL |         impl FakeDefault {
+...
+LL |
+LL ~         
+   |
+
+error: aborting due to 40 previous errors
 

src/tools/clippy/tests/ui/unwrap_or_else_default.fixed

@@ -17,19 +17,15 @@ fn unwrap_or_else_default() {
         }
     }
 
-    struct HasDefaultAndDuplicate;
+    #[derive(Default)] struct HasDefaultAndDuplicate;
 
     impl HasDefaultAndDuplicate {
         fn default() -> Self {
             HasDefaultAndDuplicate
         }
     }
 
-    impl Default for HasDefaultAndDuplicate {
-        fn default() -> Self {
-            HasDefaultAndDuplicate
-        }
-    }
+    
 
     enum Enum {
         A(),

src/tools/clippy/tests/ui/unwrap_or_else_default.stderr

@@ -97,5 +97,27 @@ error: use of `or_insert_with` to construct default value
 LL |     let _ = inner_map.entry(0).or_insert_with(Default::default);
    |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `or_default()`
 
-error: aborting due to 16 previous errors
+error: `impl Default` that could be derived
+  --> tests/ui/unwrap_or_else_default.rs:28:5
+   |
+LL | /     impl Default for HasDefaultAndDuplicate {
+LL | |         fn default() -> Self {
+LL | |             HasDefaultAndDuplicate
+   | |             ---------------------- this type has no fields, so it's trivially derivable
+LL | |         }
+LL | |     }
+   | |_____^
+   |
+   = note: `-D default-could-be-derived` implied by `-D warnings`
+   = help: to override `-D warnings` add `#[allow(default_could_be_derived)]`
+help: you don't need to manually `impl Default`, you can derive it
+   |
+LL ~     #[derive(Default)] struct HasDefaultAndDuplicate;
+LL |
+...
+LL |
+LL ~     
+   |
+
+error: aborting due to 17 previous errors