fix tidy errors

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.

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 {

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",

src/librustc_metadata/decoder.rs

@@ -349,8 +349,10 @@ impl<'a, 'tcx> SpecializedDecoder<Span> 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 lo = (lo + source_file.translated_source_file.start_pos)
-        let hi = (hi + source_file.translated_source_file.start_pos) - source_file.original_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))
     }

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",

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), &note_str);
+                            err.span_note(self.tcx.sess.source_map().def_span(note_span),
+                                          &note_str);
                         } else {
                             err.note(&note_str);
                         }

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!("<pre>{}</pre>", src);
     }

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<syntax_pos::SourceFile>, override_span: Option<Span>)
+    fn new_raw(sess: &'a ParseSess,
-        -> Self
+               source_file: Lrc<syntax_pos::SourceFile>,
-    {
+               override_span: Option<Span>) -> 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<syntax_pos::SourceFile>, override_span: Option<Span>)
+    pub fn new(sess: &'a ParseSess,
-        -> Self
+               source_file: Lrc<syntax_pos::SourceFile>,
-    {
+               override_span: Option<Span>) -> Self {
         let mut sr = StringReader::new_raw(sess, source_file, override_span);
         if sr.advance_token().is_err() {
             sr.emit_fatal_errors();

src/libsyntax/parse/mod.rs

@@ -240,8 +240,9 @@ fn file_to_source_file(sess: &ParseSess, path: &Path, spanopt: Option<Span>)
 }
 
 /// Given a source_file, produce a sequence of token-trees
-pub fn source_file_to_stream(sess: &ParseSess, source_file: Lrc<SourceFile>, override_span: Option<Span>)
+pub fn source_file_to_stream(sess: &ParseSess,
-                         -> TokenStream {
+                             source_file: Lrc<SourceFile>,
+                             override_span: Option<Span>) -> TokenStream {
     let mut srdr = lexer::StringReader::new(sess, source_file, override_span);
     srdr.real_token();
     panictry!(srdr.parse_all_token_trees())

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
     }