about summary refs log tree commit diff
path: root/compiler/rustc_save_analysis/src
diff options
context:
space:
mode:
authorAndy Wang <qian.wang19@imperial.ac.uk>2021-04-10 13:48:06 +0100
committerAndy Wang <cbeuw.andy@gmail.com>2021-05-05 15:10:57 +0100
commit04079190835c04e8c671daef492144dfe06564ab (patch)
treeeb1ae6913927e715446fdfd90a6d5de0062d8319 /compiler/rustc_save_analysis/src
parent9e0426d7842c4a603237789b59e6c491d2dd3b4a (diff)
downloadrust-04079190835c04e8c671daef492144dfe06564ab.tar.gz
rust-04079190835c04e8c671daef492144dfe06564ab.zip
Use RealFileName for Session::working_dir as it may also be remapped
Diffstat (limited to 'compiler/rustc_save_analysis/src')
-rw-r--r--compiler/rustc_save_analysis/src/dump_visitor.rs2
-rw-r--r--compiler/rustc_save_analysis/src/span_utils.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_save_analysis/src/dump_visitor.rs b/compiler/rustc_save_analysis/src/dump_visitor.rs
index 12c77e0c8a6..ab1b4db6293 100644
--- a/compiler/rustc_save_analysis/src/dump_visitor.rs
+++ b/compiler/rustc_save_analysis/src/dump_visitor.rs
@@ -190,7 +190,7 @@ impl<'tcx> DumpVisitor<'tcx> {
         };
 
         let data = CompilationOptions {
-            directory: self.tcx.sess.working_dir.0.clone(),
+            directory: self.tcx.sess.working_dir.stable_name().into(),
             program,
             arguments,
             output: self.save_ctxt.compilation_output(crate_name),
diff --git a/compiler/rustc_save_analysis/src/span_utils.rs b/compiler/rustc_save_analysis/src/span_utils.rs
index 5e16a427f3f..bcda3a6d006 100644
--- a/compiler/rustc_save_analysis/src/span_utils.rs
+++ b/compiler/rustc_save_analysis/src/span_utils.rs
@@ -26,7 +26,7 @@ impl<'a> SpanUtils<'a> {
                         .display()
                         .to_string()
                 } else {
-                    self.sess.working_dir.0.join(&path).display().to_string()
+                    self.sess.working_dir.stable_name().join(&path).display().to_string()
                 }
             }
             // If the file name was remapped, we assume the user