Merge pull request #1460 from killercup/rustup/2017-01-20

Rustup to nightly from 2017-01-20

diff --git a/clippy_lints/src/map_clone.rs b/clippy_lints/src/map_clone.rs
index 76ffd89c64ec30217f8d1108664bce126be8f814..9dff7e8c8ff54b3525053a31f7a329e41b8823ee 100644 (file)
--- a/clippy_lints/src/map_clone.rs
+++ b/clippy_lints/src/map_clone.rs
@@ -1,8 +1,8 @@
 use rustc::lint::*;
 use rustc::hir::*;
 use syntax::ast;
-use utils::{is_adjusted, match_path, match_trait_method, match_type, remove_blocks, paths, snippet,
-            span_help_and_lint, walk_ptrs_ty, walk_ptrs_ty_depth, iter_input_pats};
+use utils::{is_adjusted, match_path, match_trait_method, match_type, remove_blocks, paths, snippet, span_help_and_lint,
+            walk_ptrs_ty, walk_ptrs_ty_depth, iter_input_pats};
 
 /// **What it does:** Checks for mapping `clone()` over an iterator.
 ///

diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
index 87cf3c5442973df567424c4aec3f45abb8ea882e..d453a90950bb68ab2a7a5b911e6f537bfc958dd9 100644 (file)
--- a/clippy_lints/src/utils/mod.rs
+++ b/clippy_lints/src/utils/mod.rs
@@ -576,7 +576,7 @@ pub fn multispan_sugg(db: &mut DiagnosticBuilder, help_msg: String, sugg: &[(Spa
 
     let sub = rustc_errors::SubDiagnostic {
         level: rustc_errors::Level::Help,
-        message: help_msg,
+        message: vec![(help_msg, rustc_errors::snippet::Style::LabelPrimary)],
         span: MultiSpan::new(),
         render_span: Some(sugg),
     };