Add applicability to multispan_sugg

Author: flip1995

clippy_lints/src/eq_op.rs

@@ -1,6 +1,7 @@
 use rustc::hir::*;
 use rustc::lint::*;
 use rustc::{declare_lint, lint_array};
+use rustc_errors::Applicability;
 use crate::utils::{in_macro, implements_trait, is_copy, multispan_sugg, snippet, span_lint, span_lint_and_then, SpanlessEq};
 
 /// **What it does:** Checks for equal operands to comparison, logical and
@@ -107,6 +108,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EqOp {
                                         db,
                                         "use the values directly".to_string(),
                                         vec![(left.span, lsnip), (right.span, rsnip)],
+                                        Applicability::HasPlaceholders,
                                     );
                                 },
                             )

clippy_lints/src/loops.rs

@@ -1073,6 +1073,7 @@ fn check_for_loop_range<'a, 'tcx>(
                                     (pat.span, format!("({}, <item>)", ident.name)),
                                     (arg.span, format!("{}.{}().enumerate(){}{}", indexed, method, take, skip)),
                                 ],
+                                Applicability::HasPlaceholders,
                             );
                         },
                     );
@@ -1093,6 +1094,7 @@ fn check_for_loop_range<'a, 'tcx>(
                                 db,
                                 "consider using an iterator".to_string(),
                                 vec![(pat.span, "<item>".to_string()), (arg.span, repl)],
+                                Applicability::HasPlaceholders,
                             );
                         },
                     );
@@ -1404,6 +1406,7 @@ fn check_for_loop_over_map_kv<'a, 'tcx>(
                                 (pat_span, snippet(cx, new_pat_span, kind).into_owned()),
                                 (arg_span, format!("{}.{}s{}()", map.maybe_par(), kind, mutbl)),
                             ],
+                            Applicability::HasPlaceholders,
                         );
                     },
                 );

clippy_lints/src/matches.rs

@@ -433,7 +433,7 @@ fn check_match_ref_pats(cx: &LateContext<'_, '_>, ex: &Expr, arms: &[Arm], expr:
         }));
 
         span_lint_and_then(cx, MATCH_REF_PATS, expr.span, title, |db| {
-            multispan_sugg(db, msg.to_owned(), suggs);
+            multispan_sugg(db, msg.to_owned(), suggs, Applicability::HasPlaceholders);
         });
     }
 }

clippy_lints/src/needless_pass_by_value.rs

@@ -9,6 +9,7 @@ use rustc::ty::{self, RegionKind, TypeFoldable};
 use rustc::traits;
 use rustc::middle::expr_use_visitor as euv;
 use rustc::middle::mem_categorization as mc;
+use rustc_errors::Applicability;
 use rustc_target::spec::abi::Abi;
 use syntax::ast::NodeId;
 use syntax_pos::Span;
@@ -284,7 +285,11 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NeedlessPassByValue {
                             );
                             spans.sort_by_key(|&(span, _)| span);
                         }
-                        multispan_sugg(db, "consider taking a reference instead".to_string(), spans);
+                        multispan_sugg(db,
+                                       "consider taking a reference instead".to_string(),
+                                       spans,
+                                       Applicability::HasPlaceholders,
+                        );
                     };
 
                     span_lint_and_then(

clippy_lints/src/types.rs

@@ -1793,10 +1793,15 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ImplicitHasher {
                         format!("{}<{}, S>", target.type_name(), target.type_arguments(),),
                     ),
                 ],
+                Applicability::HasPlaceholders,
             );
 
             if !vis.suggestions.is_empty() {
-                multispan_sugg(db, "...and use generic constructor".into(), vis.suggestions);
+                multispan_sugg(db,
+                               "...and use generic constructor".into(),
+                               vis.suggestions,
+                               Applicability::HasPlaceholders,
+                );
             }
         }
 

clippy_lints/src/utils/mod.rs

@@ -613,8 +613,12 @@ pub fn span_lint_and_sugg<'a, 'tcx: 'a, T: LintContext<'tcx>>(
 /// appear once per
 /// replacement. In human-readable format though, it only appears once before
 /// the whole suggestion.
-pub fn multispan_sugg<I>(db: &mut DiagnosticBuilder<'_>, help_msg: String, sugg: I)
-where
+pub fn multispan_sugg<I>(
+    db: &mut DiagnosticBuilder,
+    help_msg: String,
+    sugg: I,
+    applicability: Applicability,
+) where
     I: IntoIterator<Item = (Span, String)>,
 {
     let sugg = CodeSuggestion {
@@ -632,7 +636,7 @@ where
         ],
         msg: help_msg,
         show_code_when_inline: true,
-        applicability: Applicability::Unspecified,
+        applicability,
     };
     db.suggestions.push(sugg);
 }