kawaemon / shoutter

yet another sns
MIT License
3 stars 0 forks source link

model: create very basic models #12

Closed loxygenK closed 1 year ago

loxygenK commented 1 year ago

I tried to rebase model/feat/create-weet onto current master and all changes went infinity and beyond so I recovered everything reflog and created new PR..

loxygenK commented 1 year ago

@kawaemon ごめんなさい、 #1 を master に rebase しようとしたらなにかを間違えて diff が消えたので作り直しました、、 こないだレビューしてもらったものから diff は(ほぼ)変わってないですが、念の為もう一回 approve してもらえるとうれしいです、、

git diff 124598d..HEAD crates/shoutter_model/ | xsel -bi124598d は #1 で force-push する前の HEAD です) ```diff diff --git a/crates/shoutter_model/src/id.rs b/crates/shoutter_model/src/id.rs index 3019274..509cde3 100644 --- a/crates/shoutter_model/src/id.rs +++ b/crates/shoutter_model/src/id.rs @@ -1,4 +1,6 @@ -use std::{fmt::Display, marker::PhantomData, str::FromStr}; +use std::fmt::Display; +use std::marker::PhantomData; +use std::str::FromStr; use derivative::Derivative; use uuid::Uuid; diff --git a/crates/shoutter_model/src/shout.rs b/crates/shoutter_model/src/shout.rs index 3890965..80bf6f1 100644 --- a/crates/shoutter_model/src/shout.rs +++ b/crates/shoutter_model/src/shout.rs @@ -2,7 +2,8 @@ use std::collections::HashSet; use validator::{Validate, ValidationErrors}; -use crate::{id::Id, user::User}; +use crate::id::Id; +use crate::user::User; #[derive(Debug, Validate)] pub struct Shout { diff --git a/crates/shoutter_model/src/user.rs b/crates/shoutter_model/src/user.rs index 19dc243..8c3e9a4 100644 --- a/crates/shoutter_model/src/user.rs +++ b/crates/shoutter_model/src/user.rs @@ -1,8 +1,7 @@ -use crate::validation::only_ascii; - -use validator::{Validate, ValidationError}; +use validator::Validate; use crate::id::Id; +use crate::validation::only_ascii; #[derive(Debug, Validate)] pub struct User { ```
loxygenK commented 1 year ago

あマージされてたありがとうございます