Migrate ItemType::from_type_kind to convert::From.

diff --git a/src/librustdoc/html/item_type.rs b/src/librustdoc/html/item_type.rs
index 31d965fccc2c0030e3d27bd8c90c25716ff17e3f..be192179284676b9b76fa40162cf22c4ef8ffc31 100644 (file)
--- a/src/librustdoc/html/item_type.rs
+++ b/src/librustdoc/html/item_type.rs
@@ -85,8 +85,8 @@ fn from(item: &'a clean::Item) -> ItemType {
     }
 }
 
-impl ItemType {
-    pub fn from_type_kind(kind: clean::TypeKind) -> ItemType {
+impl From<clean::TypeKind> for ItemType {
+    fn from(kind: clean::TypeKind) -> ItemType {
         match kind {
             clean::TypeStruct   => ItemType::Struct,
             clean::TypeEnum     => ItemType::Enum,
@@ -99,7 +99,9 @@ pub fn from_type_kind(kind: clean::TypeKind) -> ItemType {
             clean::TypeTypedef  => ItemType::Typedef,
         }
     }
+}
 
+impl ItemType {
     pub fn css_class(&self) -> &'static str {
         match *self {
             ItemType::Module          => "mod",

diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 66f54587e6b328f3a48fa24aaf88a7dd7b5783f9..6993f85c3d9a47f1a0d39697f0e04191b760a522 100644 (file)
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -509,7 +509,7 @@ pub fn run(mut krate: clean::Crate,
     } = renderinfo;
 
     let external_paths = external_paths.into_iter()
-        .map(|(k, (v, t))| (k, (v, ItemType::from_type_kind(t))))
+        .map(|(k, (v, t))| (k, (v, ItemType::from(t))))
         .collect();
 
     let mut cache = Cache {