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

Rustup to nightly from 2017-01-20
This commit is contained in:
Martin Carton 2017-01-21 20:40:07 +01:00 committed by GitHub
commit 10c541255f
2 changed files with 3 additions and 3 deletions

View file

@ -1,8 +1,8 @@
use rustc::lint::*; use rustc::lint::*;
use rustc::hir::*; use rustc::hir::*;
use syntax::ast; use syntax::ast;
use utils::{is_adjusted, match_path, match_trait_method, match_type, remove_blocks, paths, snippet, use utils::{is_adjusted, match_path, match_trait_method, match_type, remove_blocks, paths, snippet, span_help_and_lint,
span_help_and_lint, walk_ptrs_ty, walk_ptrs_ty_depth, iter_input_pats}; walk_ptrs_ty, walk_ptrs_ty_depth, iter_input_pats};
/// **What it does:** Checks for mapping `clone()` over an iterator. /// **What it does:** Checks for mapping `clone()` over an iterator.
/// ///

View file

@ -576,7 +576,7 @@ pub fn multispan_sugg(db: &mut DiagnosticBuilder, help_msg: String, sugg: &[(Spa
let sub = rustc_errors::SubDiagnostic { let sub = rustc_errors::SubDiagnostic {
level: rustc_errors::Level::Help, level: rustc_errors::Level::Help,
message: help_msg, message: vec![(help_msg, rustc_errors::snippet::Style::LabelPrimary)],
span: MultiSpan::new(), span: MultiSpan::new(),
render_span: Some(sugg), render_span: Some(sugg),
}; };