bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make local_path in RealFileName::Remapped Option to be removed in exported metadata

Browse source
This commit is contained in:
Andy Wang 2021-04-09 00:54:51 +01:00 • committed by Andy Wang
parent 6720a37042
commit 9e0426d784
No known key found for this signature in database
GPG key ID: 181B49F9F38F3374
11 changed files with 123 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_metadata/src/rmeta/decoder.rs
View file

@ -1676,7 +1676,7 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
new_path.display(),
);
let new_name = rustc_span::RealFileName::Remapped {
local_path: new_path,
local_path: Some(new_path),
virtual_name,
};
*old_name = new_name;

5
compiler/rustc_metadata/src/rmeta/encoder.rs
View file

@ -497,9 +497,10 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
RealFileName::LocalPath(local_path) => {
Path::new(&working_dir).join(local_path).into()
}
RealFileName::Remapped { local_path, virtual_name } => {
RealFileName::Remapped { local_path: _, virtual_name } => {
FileName::Real(RealFileName::Remapped {
local_path: Path::new(&working_dir).join(local_path),
// We do not want any local path to be exported into metadata
local_path: None,
virtual_name: virtual_name.clone(),
})
}