Formatting and naming

clippy_lints/src/loops.rs

@@ -2503,13 +2503,13 @@ fn check_needless_collect<'a, 'tcx>(expr: &'tcx Expr<'_>, cx: &LateContext<'a, '
                         NEEDLESS_COLLECT,
                         span,
                         NEEDLESS_COLLECT_MSG,
-                        |db| {
+                        |diag| {
                             let (arg, pred) = if contains_arg.starts_with('&') {
                                 ("x", &contains_arg[1..])
                             } else {
                                 ("&x", &*contains_arg)
                             };
-                            db.span_suggestion(
+                            diag.span_suggestion(
                                 span,
                                 "replace with",
                                 format!(

clippy_lints/src/utils/internal_lints.rs

@@ -229,7 +229,7 @@ impl EarlyLintPass for ClippyLintsInternal {
                                         CLIPPY_LINTS_INTERNAL,
                                         item.span,
                                         "this constant should be before the previous constant due to lexical \
-                                        ordering",
+                                         ordering",
                                     );
                                 }
                             }