user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Also remap absolute source names in save-analysis

Browse source
This commit is contained in:
Igor Matuszewski 2018-09-24 16:53:49 +02:00
parent 24123ddea9
commit 3ceae8db47
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/librustc_save_analysis/span_utils.rs
View file

@ -37,11 +37,18 @@ impl<'a> SpanUtils<'a> {
pub fn make_filename_string(&self, file: &SourceFile) -> String {
match &file.name {
FileName::Real(path) if !path.is_absolute() && !file.name_was_remapped => {
self.sess.working_dir.0
.join(&path)
.display()
.to_string()
FileName::Real(path) if !file.name_was_remapped => {
if path.is_absolute() {
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()
}
},
// If the file name is already remapped, we assume the user
// configured it the way they wanted to, so use that directly