From 58729346bed9f7c15c461665202fab5b7ec628c8 Mon Sep 17 00:00:00 2001 From: Vitaly _Vi Shukela Date: Tue, 18 Sep 2018 20:01:17 +0300 Subject: [PATCH] Fill in Applicability from review comments by @flip1995 --- clippy_lints/src/assign_ops.rs | 6 +++--- clippy_lints/src/attrs.rs | 2 +- clippy_lints/src/bit_mask.rs | 2 +- clippy_lints/src/booleans.rs | 4 ++++ clippy_lints/src/collapsible_if.rs | 2 +- clippy_lints/src/const_static_lifetime.rs | 2 +- clippy_lints/src/entry.rs | 4 ++-- clippy_lints/src/eq_op.rs | 8 ++++---- clippy_lints/src/eta_reduction.rs | 2 +- clippy_lints/src/format.rs | 4 ++-- clippy_lints/src/identity_conversion.rs | 6 +++--- clippy_lints/src/if_let_redundant_pattern_matching.rs | 2 +- clippy_lints/src/inline_fn_without_body.rs | 2 +- clippy_lints/src/int_plus_one.rs | 2 +- clippy_lints/src/large_enum_variant.rs | 2 +- clippy_lints/src/let_if_seq.rs | 2 +- clippy_lints/src/loops.rs | 2 +- clippy_lints/src/map_unit_fn.rs | 2 +- clippy_lints/src/matches.rs | 2 +- clippy_lints/src/methods.rs | 6 +++--- clippy_lints/src/misc.rs | 8 ++++---- clippy_lints/src/misc_early.rs | 6 +++--- clippy_lints/src/needless_borrow.rs | 4 ++-- clippy_lints/src/needless_borrowed_ref.rs | 2 +- clippy_lints/src/new_without_default.rs | 4 ++-- clippy_lints/src/question_mark.rs | 2 +- clippy_lints/src/ranges.rs | 6 +++--- clippy_lints/src/returns.rs | 2 +- clippy_lints/src/swap.rs | 2 +- 29 files changed, 52 insertions(+), 48 deletions(-) diff --git a/clippy_lints/src/assign_ops.rs b/clippy_lints/src/assign_ops.rs index 89541dd7e334..a05a4d55010b 100644 --- a/clippy_lints/src/assign_ops.rs +++ b/clippy_lints/src/assign_ops.rs @@ -90,13 +90,13 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for AssignOps { long ), format!("{} {}= {}", snip_a, op.node.as_str(), snip_r), - Applicability::Unspecified, + Applicability::MachineApplicable, ); db.span_suggestion_with_applicability( expr.span, "or", long, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); } }, @@ -183,7 +183,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for AssignOps { expr.span, "replace it with", format!("{} {}= {}", snip_a, op.node.as_str(), snip_r), - Applicability::Unspecified, + Applicability::MachineApplicable, ); } }, diff --git a/clippy_lints/src/attrs.rs b/clippy_lints/src/attrs.rs index b04eaeaebc3a..e192c3f2093f 100644 --- a/clippy_lints/src/attrs.rs +++ b/clippy_lints/src/attrs.rs @@ -208,7 +208,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for AttrPass { line_span, "if you just forgot a `!`, use", sugg, - Applicability::Unspecified, + Applicability::MachineApplicable, ); }, ); diff --git a/clippy_lints/src/bit_mask.rs b/clippy_lints/src/bit_mask.rs index d33bf670f6f5..7151e8db9aa5 100644 --- a/clippy_lints/src/bit_mask.rs +++ b/clippy_lints/src/bit_mask.rs @@ -143,7 +143,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for BitMask { e.span, "try", format!("{}.trailing_zeros() >= {}", sugg, n.count_ones()), - Applicability::Unspecified, + Applicability::MaybeIncorrect, ); }); } diff --git a/clippy_lints/src/booleans.rs b/clippy_lints/src/booleans.rs index 604e27f56ee4..1201b4a0c649 100644 --- a/clippy_lints/src/booleans.rs +++ b/clippy_lints/src/booleans.rs @@ -395,6 +395,8 @@ impl<'a, 'tcx> NonminimalBoolVisitor<'a, 'tcx> { e.span, "it would look like the following", suggest(self.cx, suggestion, &h2q.terminals).0, + // nonminimal_bool can produce minimal but + // not human readable expressions (#3141) Applicability::Unspecified, ); }, @@ -423,6 +425,8 @@ impl<'a, 'tcx> NonminimalBoolVisitor<'a, 'tcx> { e.span, "try", suggestions, + // nonminimal_bool can produce minimal but + // not human readable expressions (#3141) Applicability::Unspecified, ); }, diff --git a/clippy_lints/src/collapsible_if.rs b/clippy_lints/src/collapsible_if.rs index dcc0f65e3fc6..b0fb058116f2 100644 --- a/clippy_lints/src/collapsible_if.rs +++ b/clippy_lints/src/collapsible_if.rs @@ -142,7 +142,7 @@ fn check_collapsible_no_if_let(cx: &EarlyContext<'_>, expr: &ast::Expr, check: & lhs.and(&rhs), snippet_block(cx, content.span, ".."), ), - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }); } diff --git a/clippy_lints/src/const_static_lifetime.rs b/clippy_lints/src/const_static_lifetime.rs index 4edc84c9d092..bb9829ad3c94 100644 --- a/clippy_lints/src/const_static_lifetime.rs +++ b/clippy_lints/src/const_static_lifetime.rs @@ -65,7 +65,7 @@ impl StaticConst { ty.span, "consider removing `'static`", sugg, - Applicability::Unspecified, + Applicability::MachineApplicable, //snippet ); }, ); diff --git a/clippy_lints/src/entry.rs b/clippy_lints/src/entry.rs index 71203a247bfe..965d425b43d5 100644 --- a/clippy_lints/src/entry.rs +++ b/clippy_lints/src/entry.rs @@ -144,7 +144,7 @@ impl<'a, 'tcx, 'b> Visitor<'tcx> for InsertVisitor<'a, 'tcx, 'b> { self.span, "consider using", help, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); } else { @@ -156,7 +156,7 @@ impl<'a, 'tcx, 'b> Visitor<'tcx> for InsertVisitor<'a, 'tcx, 'b> { self.span, "consider using", help, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); } }); diff --git a/clippy_lints/src/eq_op.rs b/clippy_lints/src/eq_op.rs index f71472653bfa..7b9f2568da9a 100644 --- a/clippy_lints/src/eq_op.rs +++ b/clippy_lints/src/eq_op.rs @@ -118,7 +118,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EqOp { left.span, "use the left value directly", lsnip, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }) } else if !lcpy && rcpy && implements_trait(cx, cx.tables.expr_ty(left), trait_id, &[rty.into()]) { @@ -133,7 +133,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EqOp { right.span, "use the right value directly", rsnip, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }, ) @@ -150,7 +150,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EqOp { left.span, "use the left value directly", lsnip, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }) } @@ -166,7 +166,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EqOp { right.span, "use the right value directly", rsnip, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }) } diff --git a/clippy_lints/src/eta_reduction.rs b/clippy_lints/src/eta_reduction.rs index f18358121d65..556f76af3a7b 100644 --- a/clippy_lints/src/eta_reduction.rs +++ b/clippy_lints/src/eta_reduction.rs @@ -101,7 +101,7 @@ fn check_closure(cx: &LateContext<'_, '_>, expr: &Expr) { expr.span, "remove closure as shown", snippet, - Applicability::Unspecified, + Applicability::MachineApplicable, ); } }); diff --git a/clippy_lints/src/format.rs b/clippy_lints/src/format.rs index 29dca4556a5d..2eb95ebffbf4 100644 --- a/clippy_lints/src/format.rs +++ b/clippy_lints/src/format.rs @@ -65,7 +65,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass { expr.span, "consider using .to_string()", sugg, - Applicability::Unspecified, + Applicability::MachineApplicable, ); }); } @@ -80,7 +80,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass { span, "consider using .to_string()", sugg, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }); } diff --git a/clippy_lints/src/identity_conversion.rs b/clippy_lints/src/identity_conversion.rs index 411d7511d882..5b1bd0ada7be 100644 --- a/clippy_lints/src/identity_conversion.rs +++ b/clippy_lints/src/identity_conversion.rs @@ -68,7 +68,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for IdentityConversion { e.span, "consider removing `.into()`", sugg, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }); } @@ -83,7 +83,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for IdentityConversion { e.span, "consider removing `.into_iter()`", sugg, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }); } @@ -103,7 +103,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for IdentityConversion { e.span, &sugg_msg, sugg, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }); } diff --git a/clippy_lints/src/if_let_redundant_pattern_matching.rs b/clippy_lints/src/if_let_redundant_pattern_matching.rs index 64d088d2a991..c9fbf1b0775d 100644 --- a/clippy_lints/src/if_let_redundant_pattern_matching.rs +++ b/clippy_lints/src/if_let_redundant_pattern_matching.rs @@ -82,7 +82,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass { span, "try this", format!("if {}.{}", snippet(cx, op.span, "_"), good_method), - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }, ); diff --git a/clippy_lints/src/inline_fn_without_body.rs b/clippy_lints/src/inline_fn_without_body.rs index cedcdec1062f..881bebc2f604 100644 --- a/clippy_lints/src/inline_fn_without_body.rs +++ b/clippy_lints/src/inline_fn_without_body.rs @@ -57,7 +57,7 @@ fn check_attrs(cx: &LateContext<'_, '_>, name: Name, attrs: &[Attribute]) { attr.span, &format!("use of `#[inline]` on trait method `{}` which has no body", name), |db| { - db.suggest_remove_item(cx, attr.span, "remove", Applicability::Unspecified); + db.suggest_remove_item(cx, attr.span, "remove", Applicability::MachineApplicable); }, ); } diff --git a/clippy_lints/src/int_plus_one.rs b/clippy_lints/src/int_plus_one.rs index 14566c4f02db..69a19e2fb01f 100644 --- a/clippy_lints/src/int_plus_one.rs +++ b/clippy_lints/src/int_plus_one.rs @@ -157,7 +157,7 @@ impl IntPlusOne { block.span, "change `>= y + 1` to `> y` as shown", recommendation, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }); } diff --git a/clippy_lints/src/large_enum_variant.rs b/clippy_lints/src/large_enum_variant.rs index 8ff53e15c314..c346585250ad 100644 --- a/clippy_lints/src/large_enum_variant.rs +++ b/clippy_lints/src/large_enum_variant.rs @@ -102,7 +102,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for LargeEnumVariant { "consider boxing the large fields to reduce the total size of the \ enum", format!("Box<{}>", snip), - Applicability::Unspecified, + Applicability::MachineApplicable, ); return; } diff --git a/clippy_lints/src/let_if_seq.rs b/clippy_lints/src/let_if_seq.rs index bdeaeda7bc5d..ede55ce3721d 100644 --- a/clippy_lints/src/let_if_seq.rs +++ b/clippy_lints/src/let_if_seq.rs @@ -125,7 +125,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for LetIfSeq { span, "it is more idiomatic to write", sug, - Applicability::Unspecified, + Applicability::MaybeIncorrect, ); if !mutability.is_empty() { db.note("you might not need `mut` at all"); diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs index 70608b9895fd..2c05d9a198fe 100644 --- a/clippy_lints/src/loops.rs +++ b/clippy_lints/src/loops.rs @@ -1206,7 +1206,7 @@ fn check_for_loop_reverse_range<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, arg: &'tcx dots = dots, start = start_snippet ), - Applicability::Unspecified, + Applicability::MaybeIncorrect, ); }, ); diff --git a/clippy_lints/src/map_unit_fn.rs b/clippy_lints/src/map_unit_fn.rs index f4d48e3ad9ad..40b81e6fdb88 100644 --- a/clippy_lints/src/map_unit_fn.rs +++ b/clippy_lints/src/map_unit_fn.rs @@ -232,7 +232,7 @@ fn lint_map_unit_fn(cx: &LateContext<'_, '_>, stmt: &hir::Stmt, expr: &hir::Expr stmt.span, "try this", suggestion, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); } else { let suggestion = format!("if let {0}({1}) = {2} {{ ... }}", diff --git a/clippy_lints/src/matches.rs b/clippy_lints/src/matches.rs index d8e11d684795..4c99aeae199d 100644 --- a/clippy_lints/src/matches.rs +++ b/clippy_lints/src/matches.rs @@ -344,7 +344,7 @@ fn check_match_bool(cx: &LateContext<'_, '_>, ex: &Expr, arms: &[Arm], expr: &Ex expr.span, "consider using an if/else expression", sugg, - Applicability::Unspecified, + Applicability::MaybeIncorrect, // not sure ); } } diff --git a/clippy_lints/src/methods.rs b/clippy_lints/src/methods.rs index 5f8dc63ea573..03e3d2628e84 100644 --- a/clippy_lints/src/methods.rs +++ b/clippy_lints/src/methods.rs @@ -1132,13 +1132,13 @@ fn lint_clone_on_copy(cx: &LateContext<'_, '_>, expr: &hir::Expr, arg: &hir::Exp expr.span, "try dereferencing it", format!("{}({}{}).clone()", refs, derefs, snip.deref()), - Applicability::Unspecified, + Applicability::MaybeIncorrect, ); db.span_suggestion_with_applicability( expr.span, "or try being explicit about what type to clone", explicit, - Applicability::Unspecified, + Applicability::MaybeIncorrect, ); }, ); @@ -1659,7 +1659,7 @@ fn lint_map_or_none<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, expr: &'tcx hir::Expr, expr.span, "try using and_then instead", hint, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }); } diff --git a/clippy_lints/src/misc.rs b/clippy_lints/src/misc.rs index 0f0c86bfeb26..0fa05de28410 100644 --- a/clippy_lints/src/misc.rs +++ b/clippy_lints/src/misc.rs @@ -304,7 +304,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass { tyopt=tyopt, initref=initref, ), - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); } ); @@ -331,7 +331,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass { sugg, &snippet(cx, b.span, ".."), ), - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }); } @@ -381,7 +381,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass { expr.span, "consider comparing them within some error", format!("({}).abs() < error", lhs - rhs), - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); db.span_note(expr.span, "std::f32::EPSILON and std::f64::EPSILON are available."); }); @@ -553,7 +553,7 @@ fn check_to_owned(cx: &LateContext<'_, '_>, expr: &Expr, other: &Expr) { expr.span, "try", snip.to_string(), - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }, ); diff --git a/clippy_lints/src/misc_early.rs b/clippy_lints/src/misc_early.rs index 07c363d6f246..d3e1ca937842 100644 --- a/clippy_lints/src/misc_early.rs +++ b/clippy_lints/src/misc_early.rs @@ -312,7 +312,7 @@ impl EarlyLintPass for MiscEarly { expr.span, "Try doing something like: ", hint, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }, ); @@ -402,13 +402,13 @@ impl MiscEarly { lit.span, "if you mean to use a decimal constant, remove the `0` to remove confusion", src.trim_left_matches(|c| c == '_' || c == '0').to_string(), - Applicability::Unspecified, + Applicability::MaybeIncorrect, ); db.span_suggestion_with_applicability( lit.span, "if you mean to use an octal constant, use `0o`", format!("0o{}", src.trim_left_matches(|c| c == '_' || c == '0')), - Applicability::Unspecified, + Applicability::MaybeIncorrect, ); }); } diff --git a/clippy_lints/src/needless_borrow.rs b/clippy_lints/src/needless_borrow.rs index 1e0db1a0f9ae..8a676be99ea8 100644 --- a/clippy_lints/src/needless_borrow.rs +++ b/clippy_lints/src/needless_borrow.rs @@ -80,7 +80,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessBorrow { e.span, "change this to", snippet, - Applicability::Unspecified, + Applicability::MachineApplicable, ); } }, @@ -113,7 +113,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessBorrow { pat.span, "change this to", snippet, - Applicability::Unspecified, + Applicability::MachineApplicable, ); } } diff --git a/clippy_lints/src/needless_borrowed_ref.rs b/clippy_lints/src/needless_borrowed_ref.rs index fd275752506c..057a097f4b75 100644 --- a/clippy_lints/src/needless_borrowed_ref.rs +++ b/clippy_lints/src/needless_borrowed_ref.rs @@ -82,7 +82,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessBorrowedRef { pat.span, "try removing the `&ref` part and just keep", hint, - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }); } diff --git a/clippy_lints/src/new_without_default.rs b/clippy_lints/src/new_without_default.rs index bf5fbb8a7f5b..e0b54620faf9 100644 --- a/clippy_lints/src/new_without_default.rs +++ b/clippy_lints/src/new_without_default.rs @@ -135,7 +135,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NewWithoutDefault { sp, "try this", "#[derive(Default)]", - Applicability::Unspecified, + Applicability::MaybeIncorrect, ); }); } else { @@ -150,7 +150,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NewWithoutDefault { item.span, "try this", &create_new_without_default_suggest_msg(self_ty), - Applicability::Unspecified, + Applicability::MaybeIncorrect, ); }, ); diff --git a/clippy_lints/src/question_mark.rs b/clippy_lints/src/question_mark.rs index f4920e52a710..ced0fe3ef506 100644 --- a/clippy_lints/src/question_mark.rs +++ b/clippy_lints/src/question_mark.rs @@ -75,7 +75,7 @@ impl QuestionMarkPass { expr.span, "replace_it_with", format!("{}?;", receiver_str), - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); } ) diff --git a/clippy_lints/src/ranges.rs b/clippy_lints/src/ranges.rs index 71b68d97e401..c60ed3842d4f 100644 --- a/clippy_lints/src/ranges.rs +++ b/clippy_lints/src/ranges.rs @@ -155,14 +155,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass { expr.span, "use", format!("({}..={})", start, end), - Applicability::Unspecified, + Applicability::MaybeIncorrect, ); } else { db.span_suggestion_with_applicability( expr.span, "use", format!("{}..={}", start, end), - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); } } @@ -188,7 +188,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass { expr.span, "use", format!("{}..{}", start, end), - Applicability::Unspecified, + Applicability::MachineApplicable, // snippet ); }, ); diff --git a/clippy_lints/src/returns.rs b/clippy_lints/src/returns.rs index f90d8659dbe8..9ab6b50ada6b 100644 --- a/clippy_lints/src/returns.rs +++ b/clippy_lints/src/returns.rs @@ -113,7 +113,7 @@ impl ReturnPass { ret_span, "remove `return` as shown", snippet, - Applicability::Unspecified, + Applicability::MachineApplicable, ); } }); diff --git a/clippy_lints/src/swap.rs b/clippy_lints/src/swap.rs index 5ca78957f08e..5de2f0e54a90 100644 --- a/clippy_lints/src/swap.rs +++ b/clippy_lints/src/swap.rs @@ -194,7 +194,7 @@ fn check_suspicious_swap(cx: &LateContext<'_, '_>, block: &Block) { lhs, rhs, ), - Applicability::Unspecified, + Applicability::MaybeIncorrect, ); db.note("or maybe you should use `std::mem::replace`?"); }