diff options
| author | Oliver Middleton <olliemail27@gmail.com> | 2016-06-30 23:16:44 +0100 |
|---|---|---|
| committer | Oliver Middleton <olliemail27@gmail.com> | 2016-06-30 23:22:16 +0100 |
| commit | 76f22f4de65c992d8622865ea152258dd8913bcb (patch) | |
| tree | 5a3d57497be8eaf2fe8c86975ab5a33b49888870 /src/librustdoc | |
| parent | c2b56fb7a0c24e04227318ca7e5950e9289ee3e4 (diff) | |
| download | rust-76f22f4de65c992d8622865ea152258dd8913bcb.tar.gz rust-76f22f4de65c992d8622865ea152258dd8913bcb.zip | |
rustdoc: Remove paths from primitive page <title> tags
Currently primitive pages have a title like "std::u8 - Rust" this changes it to "u8 - Rust" as "std::u8" is the name of a module not a primitive type.
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 3 | ||||
| -rw-r--r-- | src/librustdoc/html/render.rs | 15 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 65902205312..bc3d9d83399 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -317,6 +317,9 @@ impl Item { pub fn is_ty_method(&self) -> bool { ItemType::from_item(self) == ItemType::TyMethod } + pub fn is_primitive(&self) -> bool { + ItemType::from_item(self) == ItemType::Primitive + } pub fn is_stripped(&self) -> bool { match self.inner { StrippedItem(..) => true, _ => false } } diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 48acf31b993..35be593b3bd 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -1308,7 +1308,12 @@ impl Context { *slot.borrow_mut() = cx.current.clone(); }); - let mut title = cx.current.join("::"); + let mut title = if it.is_primitive() { + // No need to include the namespace for primitive types + String::new() + } else { + cx.current.join("::") + }; if pushname { if !title.is_empty() { title.push_str("::"); @@ -1559,11 +1564,7 @@ impl<'a> fmt::Display for Item<'a> { clean::PrimitiveItem(..) => write!(fmt, "Primitive Type ")?, _ => {} } - let is_primitive = match self.item.inner { - clean::PrimitiveItem(..) => true, - _ => false, - }; - if !is_primitive { + if !self.item.is_primitive() { let cur = &self.cx.current; let amt = if self.item.is_mod() { cur.len() - 1 } else { cur.len() }; for (i, component) in cur.iter().enumerate().take(amt) { @@ -1595,7 +1596,7 @@ impl<'a> fmt::Display for Item<'a> { // [src] link in the downstream documentation will actually come back to // this page, and this link will be auto-clicked. The `id` attribute is // used to find the link to auto-click. - if self.cx.shared.include_sources && !is_primitive { + if self.cx.shared.include_sources && !self.item.is_primitive() { if let Some(l) = self.href() { write!(fmt, "<a id='src-{}' class='srclink' \ href='{}' title='{}'>[src]</a>", |
