From 6f103de164bb13f589dd8de190a71d0bb319b35b Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Sat, 21 Jan 2017 17:20:01 +0100 Subject: [PATCH 1/2] Rustup to nightly from 2017-01-20 Adjust `multispan_sugg` to rust-lang/rust#38955 --- clippy_lints/src/utils/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index 87cf3c544..d453a9095 100644 --- 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), }; From b228434036d9a85c7975d301d944f15574645bb0 Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Sat, 21 Jan 2017 18:04:59 +0100 Subject: [PATCH 2/2] Rustfmtup to 0.7.1 --- clippy_lints/src/map_clone.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clippy_lints/src/map_clone.rs b/clippy_lints/src/map_clone.rs index 76ffd89c6..9dff7e8c8 100644 --- 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. ///