Merge new_without_default_derive into new_without_default

Author: russelltg

clippy_lints/src/deprecated_lints.rs

@@ -123,3 +123,13 @@ declare_deprecated_lint! {
     pub UNSAFE_VECTOR_INITIALIZATION,
     "the replacement suggested by this lint had substantially different behavior"
 }
+
+
+/// **What it does:** Nothing, this lint has been deprecated.
+///
+/// **Deprecation reason:** This lint was merged with new_without_default
+declare_deprecated_lint! {
+    pub NEW_WITHOUT_DEFAULT_DERIVE,
+    style,
+    "`fn new() -> Self` without `#[derive]`able `Default` implementation"
+}

clippy_lints/src/lib.rs

@@ -336,6 +336,10 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
         "unsafe_vector_initialization",
         "the replacement suggested by this lint had substantially different behavior",
     );
+    store.register_removed(
+        "new_without_default_derive",
+        "this lint has been moved into new_without_default"
+    );
     // end deprecated lints, do not remove this comment, it’s used in `update_lints`
 
     reg.register_late_lint_pass(box serde_api::Serde);
@@ -701,7 +705,6 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
         neg_cmp_op_on_partial_ord::NEG_CMP_OP_ON_PARTIAL_ORD,
         neg_multiply::NEG_MULTIPLY,
         new_without_default::NEW_WITHOUT_DEFAULT,
-        new_without_default::NEW_WITHOUT_DEFAULT_DERIVE,
         no_effect::NO_EFFECT,
         no_effect::UNNECESSARY_OPERATION,
         non_copy_const::BORROW_INTERIOR_MUTABLE_CONST,
@@ -837,7 +840,6 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
         mut_reference::UNNECESSARY_MUT_PASSED,
         neg_multiply::NEG_MULTIPLY,
         new_without_default::NEW_WITHOUT_DEFAULT,
-        new_without_default::NEW_WITHOUT_DEFAULT_DERIVE,
         non_expressive_names::JUST_UNDERSCORES_AND_DIGITS,
         non_expressive_names::MANY_SINGLE_CHAR_NAMES,
         ok_if_let::IF_LET_SOME_RESULT,

clippy_lints/src/new_without_default.rs

@@ -23,6 +23,11 @@ use if_chain::if_chain;
 /// **What it does:** Checks for types with a `fn new() -> Self` method and no
 /// implementation of
 /// [`Default`](https://doc.rust-lang.org/std/default/trait.Default.html).
+/// 
+/// It detects both the case when a manual 
+/// [`Default`](https://doc.rust-lang.org/std/default/trait.Default.html) 
+/// implementation is required and also when it can be created with 
+/// `#[derive(Default)]
 ///
 /// **Why is this bad?** The user might expect to be able to use
 /// [`Default`](https://doc.rust-lang.org/std/default/trait.Default.html) as the
@@ -53,52 +58,50 @@ use if_chain::if_chain;
 ///     }
 /// }
 /// ```
-///
-/// You can also have `new()` call `Default::default()`.
-declare_clippy_lint! {
-    pub NEW_WITHOUT_DEFAULT,
-    style,
-    "`fn new() -> Self` method without `Default` implementation"
-}
-
-/// **What it does:** Checks for types with a `fn new() -> Self` method
-/// and no implementation of
-/// [`Default`](https://doc.rust-lang.org/std/default/trait.Default.html),
-/// where the `Default` can be derived by `#[derive(Default)]`.
-///
-/// **Why is this bad?** The user might expect to be able to use
-/// [`Default`](https://doc.rust-lang.org/std/default/trait.Default.html) as the
-/// type can be constructed without arguments.
-///
-/// **Known problems:** Hopefully none.
-///
-/// **Example:**
-///
+/// 
+/// Or, if 
+/// [`Default`](https://doc.rust-lang.org/std/default/trait.Default.html)
+/// can be derived by `#[derive(Default)]`:
+/// 
 /// ```rust
 /// struct Foo;
-///
+/// 
 /// impl Foo {
 ///     fn new() -> Self {
 ///         Foo
 ///     }
 /// }
 /// ```
-///
-/// Just prepend `#[derive(Default)]` before the `struct` definition.
+/// 
+/// Instead, use:
+/// 
+/// ```rust
+/// #[derive(Default)]
+/// struct Foo;
+/// 
+/// impl Foo {
+///     fn new() -> Self {
+///         Foo
+///     }
+/// }
+/// ```
+/// 
+/// You can also have `new()` call `Default::default()`.
 declare_clippy_lint! {
-    pub NEW_WITHOUT_DEFAULT_DERIVE,
+    pub NEW_WITHOUT_DEFAULT,
     style,
-    "`fn new() -> Self` without `#[derive]`able `Default` implementation"
+    "`fn new() -> Self` method without `Default` implementation"
 }
 
+
 #[derive(Clone, Default)]
 pub struct NewWithoutDefault {
     impling_types: Option<NodeSet>,
 }
 
 impl LintPass for NewWithoutDefault {
     fn get_lints(&self) -> LintArray {
-        lint_array!(NEW_WITHOUT_DEFAULT, NEW_WITHOUT_DEFAULT_DERIVE)
+        lint_array!(NEW_WITHOUT_DEFAULT)
     }
 }
 
@@ -167,7 +170,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NewWithoutDefault {
                                     if let Some(sp) = can_derive_default(self_ty, cx, default_trait_id) {
                                         span_lint_node_and_then(
                                             cx,
-                                            NEW_WITHOUT_DEFAULT_DERIVE,
+                                            NEW_WITHOUT_DEFAULT,
                                             id,
                                             impl_item.span,
                                             &format!(

tests/ui/methods.rs

@@ -14,7 +14,6 @@
     clippy::print_stdout,
     clippy::non_ascii_literal,
     clippy::new_without_default,
-    clippy::new_without_default_derive,
     clippy::missing_docs_in_private_items,
     clippy::needless_pass_by_value,
     clippy::default_trait_access,