rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rustdoc: Fix cross-crate macro source links

Browse Source 
The source filename for cross crate macros isn't quite right so the normal
generated links are invalid.

Closes #21311
This commit is contained in:
Alex Crichton
2015-04-13 15:25:40 -07:00
parent 0a46933c4d
commit 8fb31f75c9
6 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/librustdoc/html/format.rs
View File

@@ -288,9 +288,9 @@ pub fn href(did: ast::DefId) -> Option<(String, ItemType, Vec<String>)> {
repeat("../").take(loc.len()).collect::<String>()
} else {
match cache.extern_locations[&did.krate] {
render::Remote(ref s) => s.to_string(),
render::Local => repeat("../").take(loc.len()).collect::<String>(),
render::Unknown => return None,
(_, render::Remote(ref s)) => s.to_string(),
(_, render::Local) => repeat("../").take(loc.len()).collect(),
(_, render::Unknown) => return None,
}
};
for component in &fqp[..fqp.len() - 1] {
@@ -379,12 +379,12 @@ fn primitive_link(f: &mut fmt::Formatter,
node: ast::CRATE_NODE_ID,
}];
let loc = match m.extern_locations[&cnum] {
render::Remote(ref s) => Some(s.to_string()),
render::Local => {
(_, render::Remote(ref s)) => Some(s.to_string()),
(_, render::Local) => {
let len = CURRENT_LOCATION_KEY.with(|s| s.borrow().len());
Some(repeat("../").take(len).collect::<String>())
}
render::Unknown => None,
(_, render::Unknown) => None,
};
match loc {
Some(root) => {