rustdoc: Don't try to generate links for modules in import paths

The modules may be private or may even be enums so it would generate dead links.
This commit is contained in:
Oliver Middleton 2017-12-28 17:49:36 +00:00
parent 0efdfa1d62
commit 95f9491bc7
3 changed files with 36 additions and 24 deletions

View File

@ -435,32 +435,10 @@ pub fn href(did: DefId) -> Option<(String, ItemType, Vec<String>)> {
fn resolved_path(w: &mut fmt::Formatter, did: DefId, path: &clean::Path, fn resolved_path(w: &mut fmt::Formatter, did: DefId, path: &clean::Path,
print_all: bool, use_absolute: bool) -> fmt::Result { print_all: bool, use_absolute: bool) -> fmt::Result {
let last = path.segments.last().unwrap(); let last = path.segments.last().unwrap();
let rel_root = match &*path.segments[0].name {
"self" => Some("./".to_string()),
_ => None,
};
if print_all { if print_all {
let amt = path.segments.len() - 1; for seg in &path.segments[..path.segments.len() - 1] {
match rel_root { write!(w, "{}::", seg.name)?;
Some(mut root) => {
for seg in &path.segments[..amt] {
if "super" == seg.name || "self" == seg.name || w.alternate() {
write!(w, "{}::", seg.name)?;
} else {
root.push_str(&seg.name);
root.push_str("/");
write!(w, "<a class=\"mod\" href=\"{}index.html\">{}</a>::",
root,
seg.name)?;
}
}
}
None => {
for seg in &path.segments[..amt] {
write!(w, "{}::", seg.name)?;
}
}
} }
} }
if w.alternate() { if w.alternate() {

View File

@ -0,0 +1,16 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![crate_name = "foo"]
pub enum Enum{Variant}
pub use self::Enum::Variant;
// @!has foo/index.html '//a/@href' './Enum/index.html'

View File

@ -0,0 +1,18 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![crate_name = "foo"]
mod private {
pub enum Enum{Variant}
}
pub use self::private::Enum::*;
// @!has foo/index.html '//a/@href' './private/index.html'