fix tidy errors
diff --git a/src/libproc_macro/lib.rs b/src/libproc_macro/lib.rs
index 31aad29..0a32963 100644
--- a/src/libproc_macro/lib.rs
+++ b/src/libproc_macro/lib.rs
@@ -432,7 +432,7 @@
///
/// ### 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 ae88a36..3582c23 100644
--- a/src/librustc_errors/lib.rs
+++ b/src/librustc_errors/lib.rs
@@ -55,7 +55,14 @@
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 c346d3e..0936f28 100644
--- a/src/librustc_lint/builtin.rs
+++ b/src/librustc_lint/builtin.rs
@@ -195,7 +195,8 @@
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 76473ec..f4dd8861 100644
--- a/src/librustc_metadata/decoder.rs
+++ b/src/librustc_metadata/decoder.rs
@@ -349,8 +349,10 @@
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 044621d..9aa2ba3 100644
--- a/src/librustc_typeck/check/compare_method.rs
+++ b/src/librustc_typeck/check/compare_method.rs
@@ -319,7 +319,8 @@
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 ed6ec1b..31ec62b 100644
--- a/src/librustc_typeck/check/method/suggest.rs
+++ b/src/librustc_typeck/check/method/suggest.rs
@@ -132,7 +132,8 @@
};
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 2a9ad6c..5df4862 100644
--- a/src/librustdoc/html/highlight.rs
+++ b/src/librustdoc/html/highlight.rs
@@ -33,7 +33,8 @@
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 @@
}
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);
}
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs
index 434548f..448ff96 100644
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -180,9 +180,9 @@
}
/// 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>)
- -> Self
- {
+ fn new_raw(sess: &'a ParseSess,
+ 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 @@
}
}
- pub fn new(sess: &'a ParseSess, source_file: Lrc<syntax_pos::SourceFile>, override_span: Option<Span>)
- -> Self
- {
+ pub fn new(sess: &'a ParseSess,
+ 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();
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index e3a2c83..adf0119 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -240,8 +240,9 @@
}
/// 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>)
- -> TokenStream {
+pub fn source_file_to_stream(sess: &ParseSess,
+ 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())
diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs
index 457a44b..c65931a 100644
--- a/src/libsyntax/source_map.rs
+++ b/src/libsyntax/source_map.rs
@@ -241,7 +241,8 @@
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 @@
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
}
