auto merge of #14458 : huonw/rust/rustdoc-cross-crate-link-path, r=alexcrichton

Previously this was adding one-too-many `..`s to the path for the
`gotosrc=...` links for local crates. Also, the `root_path` already ends
in `/`s so a trailing / shouldn't be added after the root (some servers
treat `...//...` different to `.../...` including the one running
doc.rust-lang.org).
This commit is contained in:
bors 2014-05-28 06:06:47 -07:00
commit 24b1ce1daf
1 changed files with 2 additions and 2 deletions

View File

@ -1094,10 +1094,10 @@ impl<'a> Item<'a> {
let path = cache.external_paths.get(&self.item.def_id);
let root = match *cache.extern_locations.get(&self.item.def_id.krate) {
Remote(ref s) => s.to_string(),
Local => format!("{}/..", self.cx.root_path),
Local => self.cx.root_path.clone(),
Unknown => return None,
};
Some(format!("{root}/{path}/{file}?gotosrc={goto}",
Some(format!("{root}{path}/{file}?gotosrc={goto}",
root = root,
path = path.slice_to(path.len() - 1).connect("/"),
file = item_path(self.item),