From 6138c82803a77a44e0a56cd8999299fa7f214afe Mon Sep 17 00:00:00 2001 From: Donato Sciarra Date: Sat, 18 Aug 2018 12:14:31 +0200 Subject: [PATCH] fix tidy errors --- src/libproc_macro/lib.rs | 2 +- src/librustc_errors/lib.rs | 9 ++++++++- src/librustc_lint/builtin.rs | 3 ++- src/librustc_metadata/decoder.rs | 6 ++++-- src/librustc_typeck/check/compare_method.rs | 3 ++- src/librustc_typeck/check/method/suggest.rs | 3 ++- src/librustdoc/html/highlight.rs | 6 ++++-- src/libsyntax/parse/lexer/mod.rs | 12 ++++++------ src/libsyntax/parse/mod.rs | 5 +++-- src/libsyntax/source_map.rs | 6 ++++-- 10 files changed, 36 insertions(+), 19 deletions(-) diff --git a/src/libproc_macro/lib.rs b/src/libproc_macro/lib.rs index 31aad29d08309..0a32963a861de 100644 --- a/src/libproc_macro/lib.rs +++ b/src/libproc_macro/lib.rs @@ -432,7 +432,7 @@ impl SourceFile { /// /// ### Note /// If the code span associated with this `SourceFile` was generated by an external macro, this - /// may not be an actual path on the filesystem. Use [`is_real`] to check. + /// macro, this may not be an actual path on the filesystem. Use [`is_real`] to check. /// /// Also note that even if `is_real` returns `true`, if `--remap-path-prefix` was passed on /// the command line, the path as given may not actually be valid. diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs index ae88a365cbe48..3582c2359c8b9 100644 --- a/src/librustc_errors/lib.rs +++ b/src/librustc_errors/lib.rs @@ -55,7 +55,14 @@ pub mod registry; mod styled_buffer; mod lock; -use syntax_pos::{BytePos, Loc, FileLinesResult, SourceFile, FileName, MultiSpan, Span, NO_EXPANSION}; +use syntax_pos::{BytePos, + Loc, + FileLinesResult, + SourceFile, + FileName, + MultiSpan, + Span, + NO_EXPANSION}; #[derive(Copy, Clone, Debug, PartialEq, Hash, RustcEncodable, RustcDecodable)] pub enum Applicability { diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs index c346d3e76cd30..0936f28a8fb1e 100644 --- a/src/librustc_lint/builtin.rs +++ b/src/librustc_lint/builtin.rs @@ -195,7 +195,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NonShorthandFieldPatterns { let mut err = cx.struct_span_lint(NON_SHORTHAND_FIELD_PATTERNS, fieldpat.span, &format!("the `{}:` in this pattern is redundant", ident)); - let subspan = cx.tcx.sess.source_map().span_through_char(fieldpat.span, ':'); + let subspan = cx.tcx.sess.source_map().span_through_char(fieldpat.span, + ':'); err.span_suggestion_short_with_applicability( subspan, "remove this", diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs index 76473ec7781fd..f4dd8861e2a2c 100644 --- a/src/librustc_metadata/decoder.rs +++ b/src/librustc_metadata/decoder.rs @@ -349,8 +349,10 @@ impl<'a, 'tcx> SpecializedDecoder for DecodeContext<'a, 'tcx> { debug_assert!(hi >= source_file.original_start_pos && hi <= source_file.original_end_pos); - let lo = (lo + source_file.translated_source_file.start_pos) - source_file.original_start_pos; - let hi = (hi + source_file.translated_source_file.start_pos) - source_file.original_start_pos; + let lo = (lo + source_file.translated_source_file.start_pos) + - source_file.original_start_pos; + let hi = (hi + source_file.translated_source_file.start_pos) + - source_file.original_start_pos; Ok(Span::new(lo, hi, NO_EXPANSION)) } diff --git a/src/librustc_typeck/check/compare_method.rs b/src/librustc_typeck/check/compare_method.rs index 044621dabb458..9aa2ba363ed7a 100644 --- a/src/librustc_typeck/check/compare_method.rs +++ b/src/librustc_typeck/check/compare_method.rs @@ -319,7 +319,8 @@ fn compare_predicate_entailment<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, trait_m.ident); if let TypeError::Mutability = terr { if let Some(trait_err_span) = trait_err_span { - if let Ok(trait_err_str) = tcx.sess.source_map().span_to_snippet(trait_err_span) { + if let Ok(trait_err_str) = tcx.sess.source_map(). + span_to_snippet(trait_err_span) { diag.span_suggestion( impl_err_span, "consider change the type to match the mutability in trait", diff --git a/src/librustc_typeck/check/method/suggest.rs b/src/librustc_typeck/check/method/suggest.rs index ed6ec1bf8e6e3..31ec62ba70a95 100644 --- a/src/librustc_typeck/check/method/suggest.rs +++ b/src/librustc_typeck/check/method/suggest.rs @@ -132,7 +132,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { }; if let Some(note_span) = note_span { // We have a span pointing to the method. Show note with snippet. - err.span_note(self.tcx.sess.source_map().def_span(note_span), ¬e_str); + err.span_note(self.tcx.sess.source_map().def_span(note_span), + ¬e_str); } else { err.note(¬e_str); } diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs index 2a9ad6c7f33b2..5df4862290e3c 100644 --- a/src/librustdoc/html/highlight.rs +++ b/src/librustdoc/html/highlight.rs @@ -33,7 +33,8 @@ pub fn render_with_highlighting(src: &str, class: Option<&str>, tooltip: Option<(&str, &str)>) -> String { debug!("highlighting: ================\n{}\n==============", src); let sess = parse::ParseSess::new(FilePathMapping::empty()); - let fm = sess.source_map().new_source_file(FileName::Custom("stdin".to_string()), src.to_string()); + let fm = sess.source_map().new_source_file(FileName::Custom("stdin".to_string()), + src.to_string()); let mut out = Vec::new(); if let Some((tooltip, class)) = tooltip { @@ -43,7 +44,8 @@ pub fn render_with_highlighting(src: &str, class: Option<&str>, } write_header(class, &mut out).unwrap(); - let mut classifier = Classifier::new(lexer::StringReader::new(&sess, fm, None), sess.source_map()); + let mut classifier = Classifier::new(lexer::StringReader::new(&sess, fm, None), + sess.source_map()); if classifier.write_source(&mut out).is_err() { return format!("
{}
", src); } diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 434548ffd9d4b..448ff9676c927 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -180,9 +180,9 @@ impl<'a> StringReader<'a> { } /// For comments.rs, which hackily pokes into next_pos and ch - fn new_raw(sess: &'a ParseSess, source_file: Lrc, override_span: Option) - -> Self - { + fn new_raw(sess: &'a ParseSess, + source_file: Lrc, + override_span: Option) -> Self { let mut sr = StringReader::new_raw_internal(sess, source_file, override_span); sr.bump(); @@ -221,9 +221,9 @@ impl<'a> StringReader<'a> { } } - pub fn new(sess: &'a ParseSess, source_file: Lrc, override_span: Option) - -> Self - { + pub fn new(sess: &'a ParseSess, + source_file: Lrc, + override_span: Option) -> Self { let mut sr = StringReader::new_raw(sess, source_file, override_span); if sr.advance_token().is_err() { sr.emit_fatal_errors(); diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index e3a2c83e4c2cd..adf01197c6d9f 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -240,8 +240,9 @@ fn file_to_source_file(sess: &ParseSess, path: &Path, spanopt: Option) } /// Given a source_file, produce a sequence of token-trees -pub fn source_file_to_stream(sess: &ParseSess, source_file: Lrc, override_span: Option) - -> TokenStream { +pub fn source_file_to_stream(sess: &ParseSess, + source_file: Lrc, + override_span: Option) -> TokenStream { let mut srdr = lexer::StringReader::new(sess, source_file, override_span); srdr.real_token(); panictry!(srdr.parse_all_token_trees()) diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs index 457a44b9cbb84..c65931a857718 100644 --- a/src/libsyntax/source_map.rs +++ b/src/libsyntax/source_map.rs @@ -241,7 +241,8 @@ impl SourceMap { let mut files = self.files.borrow_mut(); files.file_maps.push(source_file.clone()); - files.stable_id_to_source_file.insert(StableFilemapId::new(&source_file), source_file.clone()); + files.stable_id_to_source_file.insert(StableFilemapId::new(&source_file), + source_file.clone()); source_file } @@ -297,7 +298,8 @@ impl SourceMap { let mut files = self.files.borrow_mut(); files.file_maps.push(source_file.clone()); - files.stable_id_to_source_file.insert(StableFilemapId::new(&source_file), source_file.clone()); + files.stable_id_to_source_file.insert(StableFilemapId::new(&source_file), + source_file.clone()); source_file }