bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #23674: nagisa/fallout-1

Browse source
This commit is contained in:
Alex Crichton 2015-03-24 16:53:38 -07:00
commit db2c3ba0cf
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustdoc/html/format.rs
View file

@ -290,7 +290,7 @@ fn resolved_path(w: &mut fmt::Formatter, did: ast::DefId, p: &clean::Path,
if ast_util::is_local(did) || cache.inlined.contains(&did) { if ast_util::is_local(did) || cache.inlined.contains(&did) {
Some(repeat("../").take(loc.len()).collect::<String>()) Some(repeat("../").take(loc.len()).collect::<String>())
} else { } else {
match cache.extern_locations[&did.krate] { match cache.extern_locations[did.krate] {
render::Remote(ref s) => Some(s.to_string()), render::Remote(ref s) => Some(s.to_string()),
render::Local => { render::Local => {
Some(repeat("../").take(loc.len()).collect::<String>()) Some(repeat("../").take(loc.len()).collect::<String>())
@ -404,11 +404,11 @@ fn primitive_link(f: &mut fmt::Formatter,
needs_termination = true; needs_termination = true;
} }
Some(&cnum) => { Some(&cnum) => {
let path = &m.paths[&ast::DefId { let path = &m.paths[ast::DefId {
krate: cnum, krate: cnum,
node: ast::CRATE_NODE_ID, node: ast::CRATE_NODE_ID,
}]; }];
let loc = match m.extern_locations[&cnum] { let loc = match m.extern_locations[cnum] {
render::Remote(ref s) => Some(s.to_string()), render::Remote(ref s) => Some(s.to_string()),
render::Local => { render::Local => {
let len = CURRENT_LOCATION_KEY.with(|s| s.borrow().len()); let len = CURRENT_LOCATION_KEY.with(|s| s.borrow().len());

6
src/librustdoc/html/render.rs
View file

@ -1409,8 +1409,8 @@ impl<'a> Item<'a> {
// located, then we return `None`. // located, then we return `None`.
} else { } else {
let cache = cache(); let cache = cache();
let path = &cache.external_paths[&self.item.def_id]; let path = &cache.external_paths[self.item.def_id];
let root = match cache.extern_locations[&self.item.def_id.krate] { let root = match cache.extern_locations[self.item.def_id.krate] {
Remote(ref s) => s.to_string(), Remote(ref s) => s.to_string(),
Local => self.cx.root_path.clone(), Local => self.cx.root_path.clone(),
Unknown => return None, Unknown => return None,
@ -1868,7 +1868,7 @@ fn item_trait(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item,
path = if ast_util::is_local(it.def_id) { path = if ast_util::is_local(it.def_id) {
cx.current.connect("/") cx.current.connect("/")
} else { } else {
let path = &cache.external_paths[&it.def_id]; let path = &cache.external_paths[it.def_id];
path[..path.len() - 1].connect("/") path[..path.len() - 1].connect("/")
}, },
ty = shortty(it).to_static_str(), ty = shortty(it).to_static_str(),

2
src/librustdoc/visit_ast.rs
View file

@ -196,7 +196,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
Some(tcx) => tcx, Some(tcx) => tcx,
None => return false None => return false
}; };
let def = tcx.def_map.borrow()[&id].def_id(); let def = tcx.def_map.borrow()[id].def_id();
if !ast_util::is_local(def) { return false } if !ast_util::is_local(def) { return false }
let analysis = match self.analysis { let analysis = match self.analysis {
Some(analysis) => analysis, None => return false Some(analysis) => analysis, None => return false