From c19dfdae64a8cbcae88df1bb1f36384830f4429a Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 12 Aug 2020 10:45:04 -0400 Subject: [PATCH] Fix formatting. --- server/lemmy_db/src/post.rs | 23 +++++++++++++++-------- server/lemmy_utils/src/lib.rs | 6 ++++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/server/lemmy_db/src/post.rs b/server/lemmy_db/src/post.rs index de8f5c6c8..b6d7de8fe 100644 --- a/server/lemmy_db/src/post.rs +++ b/server/lemmy_db/src/post.rs @@ -1,4 +1,11 @@ -use crate::{naive_now, schema::{post, post_like, post_read, post_saved}, Crud, Likeable, Saveable, Readable}; +use crate::{ + naive_now, + schema::{post, post_like, post_read, post_saved}, + Crud, + Likeable, + Readable, + Saveable, +}; use diesel::{dsl::*, result::Error, *}; use serde::{Deserialize, Serialize}; use url::{ParseError, Url}; @@ -430,17 +437,17 @@ mod tests { // Post Read let post_read_form = PostReadForm { - post_id: inserted_post.id, - user_id: inserted_user.id, - }; + post_id: inserted_post.id, + user_id: inserted_user.id, + }; let inserted_post_read = PostRead::mark_as_read(&conn, &post_read_form).unwrap(); let expected_post_read = PostRead { - id: inserted_post_read.id, - post_id: inserted_post.id, - user_id: inserted_user.id, - published: inserted_post_read.published, + id: inserted_post_read.id, + post_id: inserted_post.id, + user_id: inserted_user.id, + published: inserted_post_read.published, }; let read_post = Post::read(&conn, inserted_post.id).unwrap(); diff --git a/server/lemmy_utils/src/lib.rs b/server/lemmy_utils/src/lib.rs index ed96ad2cd..d4c75bf31 100644 --- a/server/lemmy_utils/src/lib.rs +++ b/server/lemmy_utils/src/lib.rs @@ -160,7 +160,9 @@ pub fn is_valid_username(name: &str) -> bool { // Can't do a regex here, reverse lookarounds not supported pub fn is_valid_preferred_username(preferred_username: &str) -> bool { - !preferred_username.starts_with("@") && preferred_username.len() >=3 && preferred_username.len() <= 20 + !preferred_username.starts_with("@") + && preferred_username.len() >= 3 + && preferred_username.len() <= 20 } pub fn is_valid_community_name(name: &str) -> bool { @@ -176,8 +178,8 @@ mod tests { use crate::{ is_valid_community_name, is_valid_post_title, - is_valid_username, is_valid_preferred_username, + is_valid_username, remove_slurs, scrape_text_for_mentions, slur_check,