diff options
| author | Andy Wang <qian.wang19@imperial.ac.uk> | 2021-04-09 00:54:51 +0100 |
|---|---|---|
| committer | Andy Wang <cbeuw.andy@gmail.com> | 2021-05-05 15:10:57 +0100 |
| commit | 9e0426d7842c4a603237789b59e6c491d2dd3b4a (patch) | |
| tree | 76ee0c8c2456a172edf48cb9c4385d71d0b8ff0f /compiler/rustc_metadata | |
| parent | 6720a370429282e071042af315d712e716d88abf (diff) | |
| download | rust-9e0426d7842c4a603237789b59e6c491d2dd3b4a.tar.gz rust-9e0426d7842c4a603237789b59e6c491d2dd3b4a.zip | |
Make local_path in RealFileName::Remapped Option to be removed in exported metadata
Diffstat (limited to 'compiler/rustc_metadata')
| -rw-r--r-- | compiler/rustc_metadata/src/rmeta/decoder.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_metadata/src/rmeta/encoder.rs | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/compiler/rustc_metadata/src/rmeta/decoder.rs b/compiler/rustc_metadata/src/rmeta/decoder.rs index 74325c62ed3..4cb90d5a6d6 100644 --- a/compiler/rustc_metadata/src/rmeta/decoder.rs +++ b/compiler/rustc_metadata/src/rmeta/decoder.rs @@ -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; diff --git a/compiler/rustc_metadata/src/rmeta/encoder.rs b/compiler/rustc_metadata/src/rmeta/encoder.rs index fbae2278f1e..9a398d902a7 100644 --- a/compiler/rustc_metadata/src/rmeta/encoder.rs +++ b/compiler/rustc_metadata/src/rmeta/encoder.rs @@ -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(), }) } |