Formatting and naming

Author: flip1995

clippy_lints/src/empty_enum.rs

@@ -50,7 +50,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EmptyEnum {
                     EMPTY_ENUM,
                     item.span,
                     "enum with no variants",
-                    Some(item.span),
+                    None,
                     "consider using the uninhabited type `!` (never type) or a wrapper \
                     around it to introduce a type which can't be instantiated",
                 );

clippy_lints/src/loops.rs

@@ -2473,34 +2473,37 @@ fn check_needless_collect<'a, 'tcx>(expr: &'tcx Expr<'_>, cx: &LateContext<'a, '
                 match_type(cx, ty, &paths::HASHMAP) {
                 if method.ident.name == sym!(len) {
                     let span = shorten_needless_collect_span(expr);
-                    span_lint_and_sugg(cx,
+                    span_lint_and_sugg(
+                        cx,
                         NEEDLESS_COLLECT,
                         span,
                         NEEDLESS_COLLECT_MSG,
-                            "replace with",
-                            ".count()".to_string(),
-                            Applicability::MachineApplicable,
-                        );
+                        "replace with",
+                        ".count()".to_string(),
+                        Applicability::MachineApplicable,
+                    );
                 }
                 if method.ident.name == sym!(is_empty) {
                     let span = shorten_needless_collect_span(expr);
-                    span_lint_and_sugg(cx,
+                    span_lint_and_sugg(
+                        cx,
                         NEEDLESS_COLLECT,
                         span,
                         NEEDLESS_COLLECT_MSG,
                         "replace with",
                         ".next().is_none()".to_string(),
                         Applicability::MachineApplicable,
-                        );
+                    );
                 }
                 if method.ident.name == sym!(contains) {
                     let contains_arg = snippet(cx, args[1].span, "??");
                     let span = shorten_needless_collect_span(expr);
-                    span_lint_and_then(cx,
+                    span_lint_and_then(
+                        cx,
                         NEEDLESS_COLLECT,
                         span,
                         NEEDLESS_COLLECT_MSG,
-                    |db| {
+                        |db| {
                             let (arg, pred) = if contains_arg.starts_with('&') {
                                 ("x", &contains_arg[1..])
                             } else {

clippy_lints/src/returns.rs

@@ -291,7 +291,6 @@ impl EarlyLintPass for Return {
                     String::new(),
                     Applicability::MachineApplicable,
                 );
-
             }
         }
     }

clippy_lints/src/utils/diagnostics.rs

@@ -70,15 +70,15 @@ pub fn span_lint_and_help<'a, T: LintContext>(
     help_span: Option<Span>,
     help: &str,
 ) {
-    cx.struct_span_lint(lint, span, |ldb| {
-        let mut db = ldb.build(msg);
+    cx.struct_span_lint(lint, span, |diag| {
+        let mut diag = diag.build(msg);
         if let Some(help_span) = help_span {
-            db.span_help(help_span, help);
+            diag.span_help(help_span, help);
         } else {
-            db.help(help);
+            diag.help(help);
         }
-        docs_link(&mut db, lint);
-        db.emit();
+        docs_link(&mut diag, lint);
+        diag.emit();
     });
 }
 
@@ -111,12 +111,12 @@ pub fn span_lint_and_note<'a, T: LintContext>(
     note_span: Option<Span>,
     note: &str,
 ) {
-    cx.struct_span_lint(lint, span, |ldb| {
-        let mut db = ldb.build(msg);
+    cx.struct_span_lint(lint, span, |diag| {
+        let mut diag = diag.build(msg);
         if let Some(note_span) = note_span {
-            db.span_note(note_span, note);
+            diag.span_note(note_span, note);
         } else {
-            db.note(note);
+            diag.note(note);
         }
         docs_link(&mut diag, lint);
         diag.emit();

clippy_lints/src/utils/internal_lints.rs

@@ -163,25 +163,25 @@ declare_clippy_lint! {
     /// *Example:**
     /// Bad:
     /// ```rust,ignore
-    /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| {
-    ///     db.span_suggestion(
+    /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |diag| {
+    ///     diag.span_suggestion(
     ///         expr.span,
     ///         help_msg,
     ///         sugg.to_string(),
     ///         Applicability::MachineApplicable,
     ///     );
     /// });
-    /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| {
-    ///     db.span_help(expr.span, help_msg);
+    /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |diag| {
+    ///     diag.span_help(expr.span, help_msg);
     /// });
-    /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| {
-    ///     db.help(help_msg);
+    /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |diag| {
+    ///     diag.help(help_msg);
     /// });
-    /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| {
-    ///     db.span_note(expr.span, note_msg);
+    /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |diag| {
+    ///     diag.span_note(expr.span, note_msg);
     /// });
-    /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| {
-    ///     db.note(note_msg);
+    /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |diag| {
+    ///     diag.note(note_msg);
     /// });
     /// ```
     ///
@@ -258,9 +258,10 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for LintWithoutLintPass {
                 if_chain! {
                     if let ExprKind::AddrOf(_, _, ref inner_exp) = expr.kind;
                     if let ExprKind::Struct(_, ref fields, _) = inner_exp.kind;
-                    let field = fields.iter()
-                    .find(|f| f.ident.as_str() == "desc")
-                    .expect("lints must have a description field");
+                    let field = fields
+                        .iter()
+                        .find(|f| f.ident.as_str() == "desc")
+                        .expect("lints must have a description field");
                     if let ExprKind::Lit(Spanned {
                         node: LitKind::Str(ref sym, _),
                         ..
@@ -396,7 +397,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for CompilerLintFunctions {
             if let Some(sugg) = self.map.get(&*fn_name.as_str());
             let ty = walk_ptrs_ty(cx.tables.expr_ty(&args[0]));
             if match_type(cx, ty, &paths::EARLY_CONTEXT)
-            || match_type(cx, ty, &paths::LATE_CONTEXT);
+                || match_type(cx, ty, &paths::LATE_CONTEXT);
             then {
                 span_lint_and_help(
                     cx,