From: Dessalines <tyhou13@gmx.com>
Date: Tue, 1 Sep 2020 21:44:56 +0000 (-0500)
Subject: Running cargo +nightly fmt.
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%24%7B%60data:application/%22https:/hacktivis.me/README.zh.hans.md?a=commitdiff_plain;h=dfa9cb57aa075fec31f95584e69722c9de4aca18;p=lemmy.git

Running cargo +nightly fmt.
---

diff --git a/server/lemmy_db/src/comment.rs b/server/lemmy_db/src/comment.rs
index 9bf4c2a5..76fa5ea0 100644
--- a/server/lemmy_db/src/comment.rs
+++ b/server/lemmy_db/src/comment.rs
@@ -1,9 +1,14 @@
-use super::{post::Post};
-use crate::schema::{comment, comment_like, comment_saved};
-use url::{ParseError, Url};
+use super::post::Post;
+use crate::{
+  naive_now,
+  schema::{comment, comment_like, comment_saved},
+  Crud,
+  Likeable,
+  Saveable,
+};
 use diesel::{dsl::*, result::Error, *};
 use serde::{Deserialize, Serialize};
-use crate::{Crud, naive_now, Likeable, Saveable};
+use url::{ParseError, Url};
 
 // WITH RECURSIVE MyTree AS (
 //     SELECT * FROM comment WHERE parent_id IS NULL
@@ -252,8 +257,16 @@ impl Saveable<CommentSavedForm> for CommentSaved {
 
 #[cfg(test)]
 mod tests {
-  use crate::{comment::*, community::*, post::*, tests::establish_unpooled_connection, user::*, SortType, ListingType};
-  use crate::Crud;
+  use crate::{
+    comment::*,
+    community::*,
+    post::*,
+    tests::establish_unpooled_connection,
+    user::*,
+    Crud,
+    ListingType,
+    SortType,
+  };
 
   #[test]
   fn test_crud() {
diff --git a/server/lemmy_db/src/password_reset_request.rs b/server/lemmy_db/src/password_reset_request.rs
index a5335885..0b058743 100644
--- a/server/lemmy_db/src/password_reset_request.rs
+++ b/server/lemmy_db/src/password_reset_request.rs
@@ -78,10 +78,14 @@ impl PasswordResetRequest {
 
 #[cfg(test)]
 mod tests {
-  use super::{super::user::*};
-  use crate::{tests::establish_unpooled_connection, ListingType, SortType};
-  use crate::password_reset_request::PasswordResetRequest;
-  use crate::Crud;
+  use super::super::user::*;
+  use crate::{
+    password_reset_request::PasswordResetRequest,
+    tests::establish_unpooled_connection,
+    Crud,
+    ListingType,
+    SortType,
+  };
 
   #[test]
   fn test_crud() {
diff --git a/server/lemmy_db/src/schema.rs b/server/lemmy_db/src/schema.rs
index a189dbce..c446edd9 100644
--- a/server/lemmy_db/src/schema.rs
+++ b/server/lemmy_db/src/schema.rs
@@ -523,36 +523,36 @@ joinable!(user_mention -> comment (comment_id));
 joinable!(user_mention -> user_ (recipient_id));
 
 allow_tables_to_appear_in_same_query!(
-    activity,
-    category,
-    comment,
-    comment_aggregates_fast,
-    comment_like,
-    comment_saved,
-    community,
-    community_aggregates_fast,
-    community_follower,
-    community_moderator,
-    community_user_ban,
-    mod_add,
-    mod_add_community,
-    mod_ban,
-    mod_ban_from_community,
-    mod_lock_post,
-    mod_remove_comment,
-    mod_remove_community,
-    mod_remove_post,
-    mod_sticky_post,
-    password_reset_request,
-    post,
-    post_aggregates_fast,
-    post_like,
-    post_read,
-    post_saved,
-    private_message,
-    site,
-    user_,
-    user_ban,
-    user_fast,
-    user_mention,
+  activity,
+  category,
+  comment,
+  comment_aggregates_fast,
+  comment_like,
+  comment_saved,
+  community,
+  community_aggregates_fast,
+  community_follower,
+  community_moderator,
+  community_user_ban,
+  mod_add,
+  mod_add_community,
+  mod_ban,
+  mod_ban_from_community,
+  mod_lock_post,
+  mod_remove_comment,
+  mod_remove_community,
+  mod_remove_post,
+  mod_sticky_post,
+  password_reset_request,
+  post,
+  post_aggregates_fast,
+  post_like,
+  post_read,
+  post_saved,
+  private_message,
+  site,
+  user_,
+  user_ban,
+  user_fast,
+  user_mention,
 );