bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use local and remapped paths where appropriate

Browse source
This commit is contained in:
Andy Wang 2021-04-19 23:27:02 +01:00
parent fb4f6439f6
commit 5417b45c26
No known key found for this signature in database
GPG key ID: 181B49F9F38F3374
28 changed files with 85 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_save_analysis/src/dump_visitor.rs
View file

@ -1112,7 +1112,7 @@ impl<'tcx> DumpVisitor<'tcx> {
name: String::new(),
qualname,
span,
value: filename.to_string(),
value: filename.prefer_remapped().to_string(),
children,
parent: None,
decl_id: None,

4
compiler/rustc_save_analysis/src/lib.rs
View file

@ -80,7 +80,7 @@ impl<'tcx> SaveContext<'tcx> {
let end = sm.lookup_char_pos(span.hi());
SpanData {
file_name: start.file.name.to_string().into(),
file_name: start.file.name.prefer_remapped().to_string().into(),
byte_start: span.lo().0,
byte_end: span.hi().0,
line_start: Row::new_one_indexed(start.line as u32),
@ -290,7 +290,7 @@ impl<'tcx> SaveContext<'tcx> {
name: item.ident.to_string(),
qualname,
span: self.span_from_span(item.ident.span),
value: filename.to_string(),
value: filename.prefer_remapped().to_string(),
parent: None,
children: m
.item_ids

7
compiler/rustc_save_analysis/src/span_utils.rs
View file

@ -34,12 +34,7 @@ impl<'a> SpanUtils<'a> {
.to_string()
}
}
// If the file name was remapped, we assume the user
// configured it the way they wanted to, so use that directly
FileName::Real(RealFileName::Remapped { local_path: _, virtual_name }) => {
virtual_name.display().to_string()
}
filename => filename.to_string(),
filename => filename.prefer_remapped().to_string(),
}
}