rustdoc: refactoring and tidying up

Nick Cameron · Nick Cameron · commit 9bcf9869fa0d · 2016-08-03T13:16:28.000+12:00
pulled out of rust-lang#35020
diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
@@ -326,7 +326,7 @@ pub fn href(did: DefId) -> Option<(String, ItemType, Vec<String>)> {
             url.push_str("/index.html");
         }
         _ => {
-            url.push_str(shortty.to_static_str());
+            url.push_str(shortty.css_class());
             url.push_str(".");
             url.push_str(fqp.last().unwrap());
             url.push_str(".html");
diff --git a/src/librustdoc/html/item_type.rs b/src/librustdoc/html/item_type.rs
@@ -90,7 +90,7 @@ impl ItemType {
         }
     }
 
-    pub fn to_static_str(&self) -> &'static str {
+    pub fn css_class(&self) -> &'static str {
         match *self {
             ItemType::Module          => "mod",
             ItemType::ExternCrate     => "externcrate",
@@ -117,6 +117,6 @@ impl ItemType {
 
 impl fmt::Display for ItemType {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.to_static_str().fmt(f)
+        self.css_class().fmt(f)
     }
 }
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
@@ -24,7 +24,7 @@ pub struct Layout {
 
 pub struct Page<'a> {
     pub title: &'a str,
-    pub ty: &'a str,
+    pub css_class: &'a str,
     pub root_path: &'a str,
     pub description: &'a str,
     pub keywords: &'a str,
@@ -80,7 +80,7 @@ r##"<!DOCTYPE html>
         </form>
     </nav>
 
-    <section id='main' class="content {ty}">{content}</section>
+    <section id='main' class="content {css_class}">{content}</section>
     <section id='search' class="content hidden"></section>
 
     <section class="footer"></section>
@@ -152,7 +152,7 @@ r##"<!DOCTYPE html>
     },
     content   = *t,
     root_path = page.root_path,
-    ty        = page.ty,
+    css_class = page.css_class,
     logo      = if layout.logo.is_empty() {
         "".to_string()
     } else {
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ pub fn href(did: DefId) -> Option<(String, ItemType, Vec<String>)> {`
`326`	`326`	`url.push_str("/index.html");`
`327`	`327`	`}`
`328`	`328`	`_ => {`
`329`		`- url.push_str(shortty.to_static_str());`
	`329`	`+ url.push_str(shortty.css_class());`
`330`	`330`	`url.push_str(".");`
`331`	`331`	`url.push_str(fqp.last().unwrap());`
`332`	`332`	`url.push_str(".html");`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ impl ItemType {`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`- pub fn to_static_str(&self) -> &'static str {`
	`93`	`+ pub fn css_class(&self) -> &'static str {`
`94`	`94`	`match *self {`
`95`	`95`	`ItemType::Module => "mod",`
`96`	`96`	`ItemType::ExternCrate => "externcrate",`
`@@ -117,6 +117,6 @@ impl ItemType {`
`117`	`117`
`118`	`118`	`impl fmt::Display for ItemType {`
`119`	`119`	`fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`
`120`		`- self.to_static_str().fmt(f)`
	`120`	`+ self.css_class().fmt(f)`
`121`	`121`	`}`
`122`	`122`	`}`