Handle remapped paths correctly when generating "Source" links

Author: Urgau

src/librustdoc/html/render/context.rs

@@ -14,7 +14,7 @@ use rustc_hir::def_id::{DefIdMap, LOCAL_CRATE};
 use rustc_middle::ty::TyCtxt;
 use rustc_session::Session;
 use rustc_span::edition::Edition;
-use rustc_span::{BytePos, FileName, Symbol};
+use rustc_span::{BytePos, FileName, RemapPathScopeComponents, Symbol};
 use tracing::info;
 
 use super::print_item::{full_path, print_item, print_item_path};
@@ -365,7 +365,7 @@ impl<'tcx> Context<'tcx> {
 
         // We can safely ignore synthetic `SourceFile`s.
         let file = match span.filename(self.sess()) {
-            FileName::Real(ref path) => path.local_path()?.to_path_buf(),
+            FileName::Real(ref path) => path.path(RemapPathScopeComponents::MACRO).to_path_buf(),
             _ => return None,
         };
         let file = &file;
@@ -499,7 +499,7 @@ impl<'tcx> Context<'tcx> {
         } = options;
 
         let src_root = match krate.src(tcx) {
-            FileName::Real(ref p) => match p.local_path().map(|p| p.parent()).flatten() {
+            FileName::Real(ref p) => match p.path(RemapPathScopeComponents::MACRO).parent() {
                 Some(p) => p.to_path_buf(),
                 None => PathBuf::new(),
             },

tests/run-make/rustdoc-remapped-paths/rmake.rs

@@ -18,7 +18,6 @@ fn main() {
 
     // Let's verify that "Source" links for dep exist in `MyStruct` page
     let reexport_MyStruct_content = rfs::read_to_string("doc/reexport/struct.MyStruct.html");
-    // FIXME: Those assert don't work!
     assert!(reexport_MyStruct_content.contains(r#""../src/dep/dep.rs.html#1">Source"#));
     assert!(reexport_MyStruct_content.contains(r#""../src/dep/dep.rs.html#6">Source"#));
 }