bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustdoc: Remove paths from primitive page <title> tags

Browse source 
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.
This commit is contained in:
Oliver Middleton 2016-06-30 23:16:44 +01:00
parent c2b56fb7a0
commit 76f22f4de6
3 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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>",