Fixed build for latest nightly

Author: Alexander Regueiro

clippy_lints/src/map_unit_fn.rs

@@ -1,6 +1,7 @@
 use rustc::hir;
 use rustc::lint::*;
 use rustc::ty;
+use rustc_errors::{Applicability};
 use syntax::codemap::Span;
 use utils::{in_macro, iter_input_pats, match_type, method_chain_args, snippet, span_lint_and_then};
 use utils::paths;
@@ -210,25 +211,31 @@ fn lint_map_unit_fn(cx: &LateContext, stmt: &hir::Stmt, expr: &hir::Expr, map_ar
                                  snippet(cx, fn_arg.span, "_"));
 
         span_lint_and_then(cx, lint, expr.span, &msg, |db| {
-            db.span_approximate_suggestion(stmt.span, "try this", suggestion);
+            db.span_suggestion_with_applicability(stmt.span,
+                                                  "try this",
+                                                  suggestion,
+                                                  Applicability::Unspecified);
         });
     } else if let Some((binding, closure_expr)) = unit_closure(cx, fn_arg) {
         let msg = suggestion_msg("closure", map_type);
 
         span_lint_and_then(cx, lint, expr.span, &msg, |db| {
             if let Some(reduced_expr_span) = reduce_unit_expression(cx, closure_expr) {
                 let suggestion = format!("if let {0}({1}) = {2} {{ {3} }}",
-                                        variant,
-                                        snippet(cx, binding.pat.span, "_"),
-                                        snippet(cx, var_arg.span, "_"),
-                                        snippet(cx, reduced_expr_span, "_"));
+                                         variant,
+                                         snippet(cx, binding.pat.span, "_"),
+                                         snippet(cx, var_arg.span, "_"),
+                                         snippet(cx, reduced_expr_span, "_"));
                 db.span_suggestion(stmt.span, "try this", suggestion);
             } else {
                 let suggestion = format!("if let {0}({1}) = {2} {{ ... }}",
-                                        variant,
-                                        snippet(cx, binding.pat.span, "_"),
-                                        snippet(cx, var_arg.span, "_"));
-                db.span_approximate_suggestion(stmt.span, "try this", suggestion);
+                                         variant,
+                                         snippet(cx, binding.pat.span, "_"),
+                                         snippet(cx, var_arg.span, "_"));
+                db.span_suggestion_with_applicability(stmt.span,
+                                                      "try this",
+                                                      suggestion,
+                                                      Applicability::Unspecified);
             }
         });
     }

clippy_lints/src/utils/mod.rs

@@ -9,7 +9,7 @@ use rustc::lint::{LateContext, Level, Lint, LintContext};
 use rustc::session::Session;
 use rustc::traits;
 use rustc::ty::{self, Ty, TyCtxt, layout::{self, IntegerExt}};
-use rustc_errors;
+use rustc_errors::{Applicability, CodeSuggestion, Substitution, SubstitutionPart};
 use std::borrow::Cow;
 use std::env;
 use std::mem;
@@ -645,12 +645,12 @@ pub fn multispan_sugg<I>(db: &mut DiagnosticBuilder, help_msg: String, sugg: I)
 where
     I: IntoIterator<Item = (Span, String)>,
 {
-    let sugg = rustc_errors::CodeSuggestion {
+    let sugg = CodeSuggestion {
         substitutions: vec![
-            rustc_errors::Substitution {
+            Substitution {
                 parts: sugg.into_iter()
                     .map(|(span, snippet)| {
-                        rustc_errors::SubstitutionPart {
+                        SubstitutionPart {
                             snippet,
                             span,
                         }
@@ -660,7 +660,7 @@ where
         ],
         msg: help_msg,
         show_code_when_inline: true,
-        approximate: false,
+        applicability: Applicability::Unspecified,
     };
     db.suggestions.push(sugg);
 }