summary refs log tree commit diff
path: root/src/librustdoc/test.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-06-01 15:42:51 +0000
committerbors <bors@rust-lang.org>2020-06-01 15:42:51 +0000
commit49cae55760da0a43428eba73abcb659bb70cf2e4 (patch)
tree4aaa1c51870e6e83fda6d1c86d6bac54457ab89b /src/librustdoc/test.rs
parent02c25b359e667d2eba0da4d9e75408d675b7a4d5 (diff)
parent68a0acd6341440bd6ae6e0b612f558b10e6d522f (diff)
downloadrust-1.44.0.tar.gz
rust-1.44.0.zip
Auto merge of #72883 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 1.44.0
[stable] 1.44 release

This includes a release notes update as usual and a backport of #72767.

r? @ghost
Diffstat (limited to 'src/librustdoc/test.rs')
-rw-r--r--src/librustdoc/test.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index afc1501d7b6..86bba15a6f9 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -663,7 +663,7 @@ impl Collector {
             let filename = source_map.span_to_filename(self.position);
             if let FileName::Real(ref filename) = filename {
                 if let Ok(cur_dir) = env::current_dir() {
-                    if let Ok(path) = filename.strip_prefix(&cur_dir) {
+                    if let Ok(path) = filename.local_path().strip_prefix(&cur_dir) {
                         return path.to_owned().into();
                     }
                 }
@@ -693,7 +693,7 @@ impl Tester for Collector {
         // FIXME(#44940): if doctests ever support path remapping, then this filename
         // needs to be the result of `SourceMap::span_to_unmapped_path`.
         let path = match &filename {
-            FileName::Real(path) => path.clone(),
+            FileName::Real(path) => path.local_path().to_path_buf(),
             _ => PathBuf::from(r"doctest.rs"),
         };