summary refs log tree commit diff
path: root/src/librustdoc/html/render.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/html/render.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/html/render.rs')
-rw-r--r--src/librustdoc/html/render.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index b91aab44f10..fce5a815fe2 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -465,7 +465,7 @@ pub fn run(
     } = options;
 
     let src_root = match krate.src {
-        FileName::Real(ref p) => match p.parent() {
+        FileName::Real(ref p) => match p.local_path().parent() {
             Some(p) => p.to_path_buf(),
             None => PathBuf::new(),
         },
@@ -1650,9 +1650,10 @@ impl Context {
 
         // We can safely ignore synthetic `SourceFile`s.
         let file = match item.source.filename {
-            FileName::Real(ref path) => path,
+            FileName::Real(ref path) => path.local_path().to_path_buf(),
             _ => return None,
         };
+        let file = &file;
 
         let (krate, path) = if item.source.cnum == LOCAL_CRATE {
             if let Some(path) = self.shared.local_sources.get(file) {