From eb7ad1c6cda7ebadd759ffdae40cbeb0b209c3d0 Mon Sep 17 00:00:00 2001
From: Philipp Hansch <dev@phansch.net>
Date: Fri, 17 Apr 2020 08:09:09 +0200
Subject: [PATCH] cargo dev fmt
---
clippy_lints/src/eq_op.rs | 48 ++++++++++++-------
.../src/redundant_static_lifetimes.rs | 22 +++++----
clippy_lints/src/types.rs | 28 ++++++-----
3 files changed, 61 insertions(+), 37 deletions(-)
diff --git a/clippy_lints/src/eq_op.rs b/clippy_lints/src/eq_op.rs
index 4cf58af3ba4..098d47bdd40 100644
--- a/clippy_lints/src/eq_op.rs
+++ b/clippy_lints/src/eq_op.rs
@@ -124,15 +124,21 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EqOp {
&& !rcpy
&& implements_trait(cx, lty, trait_id, &[cx.tables.expr_ty(right).into()])
{
- span_lint_and_then(cx, OP_REF, e.span, "needlessly taken reference of left operand", |diag| {
- let lsnip = snippet(cx, l.span, "...").to_string();
- diag.span_suggestion(
- left.span,
- "use the left value directly",
- lsnip,
- Applicability::MaybeIncorrect, // FIXME #2597
- );
- })
+ span_lint_and_then(
+ cx,
+ OP_REF,
+ e.span,
+ "needlessly taken reference of left operand",
+ |diag| {
+ let lsnip = snippet(cx, l.span, "...").to_string();
+ diag.span_suggestion(
+ left.span,
+ "use the left value directly",
+ lsnip,
+ Applicability::MaybeIncorrect, // FIXME #2597
+ );
+ },
+ )
} else if !lcpy
&& rcpy
&& implements_trait(cx, cx.tables.expr_ty(left), trait_id, &[rty.into()])
@@ -161,15 +167,21 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EqOp {
if (requires_ref || lcpy)
&& implements_trait(cx, lty, trait_id, &[cx.tables.expr_ty(right).into()])
{
- span_lint_and_then(cx, OP_REF, e.span, "needlessly taken reference of left operand", |diag| {
- let lsnip = snippet(cx, l.span, "...").to_string();
- diag.span_suggestion(
- left.span,
- "use the left value directly",
- lsnip,
- Applicability::MaybeIncorrect, // FIXME #2597
- );
- })
+ span_lint_and_then(
+ cx,
+ OP_REF,
+ e.span,
+ "needlessly taken reference of left operand",
+ |diag| {
+ let lsnip = snippet(cx, l.span, "...").to_string();
+ diag.span_suggestion(
+ left.span,
+ "use the left value directly",
+ lsnip,
+ Applicability::MaybeIncorrect, // FIXME #2597
+ );
+ },
+ )
}
},
// foo == &bar
diff --git a/clippy_lints/src/redundant_static_lifetimes.rs b/clippy_lints/src/redundant_static_lifetimes.rs
index dd81d43e864..c6f57298c26 100644
--- a/clippy_lints/src/redundant_static_lifetimes.rs
+++ b/clippy_lints/src/redundant_static_lifetimes.rs
@@ -53,14 +53,20 @@ impl RedundantStaticLifetimes {
if lifetime.ident.name == rustc_span::symbol::kw::StaticLifetime {
let snip = snippet(cx, borrow_type.ty.span, "<type>");
let sugg = format!("&{}", snip);
- span_lint_and_then(cx, REDUNDANT_STATIC_LIFETIMES, lifetime.ident.span, reason, |diag| {
- diag.span_suggestion(
- ty.span,
- "consider removing `'static`",
- sugg,
- Applicability::MachineApplicable, //snippet
- );
- });
+ span_lint_and_then(
+ cx,
+ REDUNDANT_STATIC_LIFETIMES,
+ lifetime.ident.span,
+ reason,
+ |diag| {
+ diag.span_suggestion(
+ ty.span,
+ "consider removing `'static`",
+ sugg,
+ Applicability::MachineApplicable, //snippet
+ );
+ },
+ );
}
},
_ => {},
diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs
index f4408fc34a3..31d8daa2d97 100644
--- a/clippy_lints/src/types.rs
+++ b/clippy_lints/src/types.rs
@@ -608,17 +608,23 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for LetUnitValue {
if higher::is_from_for_desugar(local) {
return;
}
- span_lint_and_then(cx, LET_UNIT_VALUE, stmt.span, "this let-binding has unit value", |diag| {
- if let Some(expr) = &local.init {
- let snip = snippet_with_macro_callsite(cx, expr.span, "()");
- diag.span_suggestion(
- stmt.span,
- "omit the `let` binding",
- format!("{};", snip),
- Applicability::MachineApplicable, // snippet
- );
- }
- });
+ span_lint_and_then(
+ cx,
+ LET_UNIT_VALUE,
+ stmt.span,
+ "this let-binding has unit value",
+ |diag| {
+ if let Some(expr) = &local.init {
+ let snip = snippet_with_macro_callsite(cx, expr.span, "()");
+ diag.span_suggestion(
+ stmt.span,
+ "omit the `let` binding",
+ format!("{};", snip),
+ Applicability::MachineApplicable, // snippet
+ );
+ }
+ },
+ );
}
}
}