models::user: Inline encodable_public() method

Author: Turbo87

src/models/user.rs

@@ -7,7 +7,7 @@ use crate::util::errors::AppResult;
 
 use crate::models::{ApiToken, Crate, CrateOwner, Email, NewEmail, Owner, OwnerKind, Rights};
 use crate::schema::{crate_owners, emails, users};
-use crate::views::{EncodablePrivateUser, EncodablePublicUser};
+use crate::views::EncodablePrivateUser;
 
 /// The model representing a row in the `users` database table.
 #[derive(Clone, Debug, PartialEq, Eq, Queryable, Identifiable, AsChangeset, Associations)]
@@ -203,23 +203,4 @@ impl User {
             .first(&*conn)
             .optional()?)
     }
-
-    /// Converts this`User` model into an `EncodablePublicUser` for JSON serialization.
-    pub fn encodable_public(self) -> EncodablePublicUser {
-        let User {
-            id,
-            name,
-            gh_login,
-            gh_avatar,
-            ..
-        } = self;
-        let url = format!("https://github.com/{}", gh_login);
-        EncodablePublicUser {
-            id,
-            avatar: gh_avatar,
-            login: gh_login,
-            name,
-            url: Some(url),
-        }
-    }
 }

src/views.rs

@@ -322,9 +322,24 @@ pub struct EncodablePublicUser {
     pub url: Option<String>,
 }
 
+/// Converts a `User` model into an `EncodablePublicUser` for JSON serialization.
 impl From<User> for EncodablePublicUser {
     fn from(user: User) -> Self {
-        user.encodable_public()
+        let User {
+            id,
+            name,
+            gh_login,
+            gh_avatar,
+            ..
+        } = user;
+        let url = format!("https://github.com/{}", gh_login);
+        EncodablePublicUser {
+            id,
+            avatar: gh_avatar,
+            login: gh_login,
+            name,
+            url: Some(url),
+        }
     }
 }