Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-10 23:24:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3382 from rust-lang-nursery/rustup

Browse source 
Rustup to rustc 1.31.0-nightly (fb2446ad5 2018-10-30)
This commit is contained in:
Manish Goregaokar 2018-10-30 04:23:18 +00:00 committed by GitHub
commit 481f7880df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clippy_lints/src/utils/mod.rs
View file

@ -392,7 +392,7 @@ pub fn snippet_block<'a, 'b, T: LintContext<'b>>(cx: &T, span: Span, default: &'
pub fn last_line_of_span<'a, T: LintContext<'a>>(cx: &T, span: Span) -> Span { pub fn last_line_of_span<'a, T: LintContext<'a>>(cx: &T, span: Span) -> Span {
let file_map_and_line = cx.sess().source_map().lookup_line(span.lo()).unwrap(); let file_map_and_line = cx.sess().source_map().lookup_line(span.lo()).unwrap();
let line_no = file_map_and_line.line; let line_no = file_map_and_line.line;
let line_start = &file_map_and_line.fm.lines[line_no]; let line_start = &file_map_and_line.sf.lines[line_no];
Span::new(*line_start, span.hi(), span.ctxt()) Span::new(*line_start, span.hi(), span.ctxt())
} }

2
clippy_lints/src/utils/sugg.rs
View file

@ -548,7 +548,7 @@ impl<'a, 'b, 'c, T: LintContext<'c>> DiagnosticBuilderExt<'c, T> for rustc_error
let hi = cx.sess().source_map().next_point(remove_span).hi(); let hi = cx.sess().source_map().next_point(remove_span).hi();
let fmpos = cx.sess().source_map().lookup_byte_offset(hi); let fmpos = cx.sess().source_map().lookup_byte_offset(hi);
if let Some(ref src) = fmpos.fm.src { if let Some(ref src) = fmpos.sf.src {
let non_whitespace_offset = src[fmpos.pos.to_usize()..].find(|c| c != ' ' && c != '\t' && c != '\n'); let non_whitespace_offset = src[fmpos.pos.to_usize()..].find(|c| c != ' ' && c != '\t' && c != '\n');
if let Some(non_whitespace_offset) = non_whitespace_offset { if let Some(non_whitespace_offset) = non_whitespace_offset {