Skip to content

Commit ff0c979

Browse files
committed
models::crate_owner_invitation: Inline encodable() method
1 parent 6adc1b7 commit ff0c979

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

src/models/crate_owner_invitation.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use chrono::NaiveDateTime;
22
use diesel::prelude::*;
33

44
use crate::schema::{crate_owner_invitations, crates, users};
5-
use crate::views::EncodableCrateOwnerInvitation;
65

76
/// The model representing a row in the `crate_owner_invitations` database table.
87
#[derive(Clone, Debug, PartialEq, Eq, Identifiable, Queryable)]
@@ -40,13 +39,4 @@ impl CrateOwnerInvitation {
4039
.first(&*conn)
4140
.unwrap_or_else(|_| String::from("(unknown crate name)"))
4241
}
43-
44-
pub fn encodable(self, conn: &PgConnection) -> EncodableCrateOwnerInvitation {
45-
EncodableCrateOwnerInvitation {
46-
invited_by_username: self.invited_by_username(conn),
47-
crate_name: self.crate_name(conn),
48-
crate_id: self.crate_id,
49-
created_at: self.created_at,
50-
}
51-
}
5242
}

src/views.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,12 @@ pub struct EncodableCrateOwnerInvitation {
7979

8080
impl EncodableCrateOwnerInvitation {
8181
pub fn from(invitation: CrateOwnerInvitation, conn: &PgConnection) -> Self {
82-
invitation.encodable(conn)
82+
Self {
83+
invited_by_username: invitation.invited_by_username(conn),
84+
crate_name: invitation.crate_name(conn),
85+
crate_id: invitation.crate_id,
86+
created_at: invitation.created_at,
87+
}
8388
}
8489
}
8590

0 commit comments

Comments
 (0)