models::category: Inline encodable() method

Author: Turbo87

src/models/category.rs

@@ -3,7 +3,6 @@ use diesel::{self, *};
 
 use crate::models::Crate;
 use crate::schema::*;
-use crate::views::EncodableCategory;
 
 #[derive(Clone, Identifiable, Queryable, QueryableByName, Debug)]
 #[table_name = "categories"]
@@ -57,25 +56,6 @@ impl Category {
         categories::table.filter(Self::with_slugs_case_sensitive(slugs))
     }
 
-    pub fn encodable(self) -> EncodableCategory {
-        let Category {
-            crates_cnt,
-            category,
-            slug,
-            description,
-            created_at,
-            ..
-        } = self;
-        EncodableCategory {
-            id: slug.clone(),
-            slug,
-            description,
-            created_at,
-            crates_cnt,
-            category: category.rsplit("::").collect::<Vec<_>>()[0].to_string(),
-        }
-    }
-
     pub fn update_crate(
         conn: &PgConnection,
         krate: &Crate,

src/views.rs

@@ -30,7 +30,22 @@ pub struct EncodableCategory {
 
 impl From<Category> for EncodableCategory {
     fn from(category: Category) -> Self {
-        category.encodable()
+        let Category {
+            crates_cnt,
+            category,
+            slug,
+            description,
+            created_at,
+            ..
+        } = category;
+        Self {
+            id: slug.clone(),
+            slug,
+            description,
+            created_at,
+            crates_cnt,
+            category: category.rsplit("::").collect::<Vec<_>>()[0].to_string(),
+        }
     }
 }