diff options
Diffstat (limited to 'src/librustc_save_analysis/span_utils.rs')
| -rw-r--r-- | src/librustc_save_analysis/span_utils.rs | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/librustc_save_analysis/span_utils.rs b/src/librustc_save_analysis/span_utils.rs index f2f512bc8e5..59be4a0a9fb 100644 --- a/src/librustc_save_analysis/span_utils.rs +++ b/src/librustc_save_analysis/span_utils.rs @@ -11,29 +11,27 @@ pub struct SpanUtils<'a> { impl<'a> SpanUtils<'a> { pub fn new(sess: &'a Session) -> SpanUtils<'a> { - SpanUtils { - sess, - } + SpanUtils { sess } } pub fn make_filename_string(&self, file: &SourceFile) -> String { match &file.name { FileName::Real(path) if !file.name_was_remapped => { if path.is_absolute() { - self.sess.source_map().path_mapping() - .map_prefix(path.clone()).0 + self.sess + .source_map() + .path_mapping() + .map_prefix(path.clone()) + .0 .display() .to_string() } else { - self.sess.working_dir.0 - .join(&path) - .display() - .to_string() + self.sess.working_dir.0.join(&path).display().to_string() } - }, + } // If the file name is already remapped, we assume the user // configured it the way they wanted to, so use that directly - filename => filename.to_string() + filename => filename.to_string(), } } @@ -111,11 +109,7 @@ impl<'a> SpanUtils<'a> { } //If the span comes from a fake source_file, filter it. - !self.sess - .source_map() - .lookup_char_pos(span.lo()) - .file - .is_real_file() + !self.sess.source_map().lookup_char_pos(span.lo()).file.is_real_file() } } |
