From 8b0374cc4e87439bc7a725cfb8a21aaa7c4f5cad Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Fri, 11 Dec 2020 14:57:43 +0100
Subject: [PATCH] also check formatting, more extensive cargo check

---
 .drone.yml             |  7 ++++-
 lemmy_db/src/schema.rs | 68 +++++++++++++++++++++---------------------
 src/main.rs            |  6 ++--
 3 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c6977ed9..5075d6f2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,10 +9,15 @@ steps:
     commands:
       - chown 1000:1000 . -R
 
+  - name: check formatting
+    image: ekidd/rust-musl-builder:1.47.0
+    commands:
+      - cargo fmt -- --check
+
   - name: cargo check
     image: ekidd/rust-musl-builder:1.47.0
     commands:
-      - cargo check --all
+      - cargo check --workspace --all-targets
 
   - name: cargo clippy
     image: ekidd/rust-musl-builder:1.47.0
diff --git a/lemmy_db/src/schema.rs b/lemmy_db/src/schema.rs
index 535f4c53..49bbc46f 100644
--- a/lemmy_db/src/schema.rs
+++ b/lemmy_db/src/schema.rs
@@ -557,38 +557,38 @@ 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_report,
-    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_report,
-    post_saved,
-    private_message,
-    site,
-    user_,
-    user_ban,
-    user_fast,
-    user_mention,
+  activity,
+  category,
+  comment,
+  comment_aggregates_fast,
+  comment_like,
+  comment_report,
+  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_report,
+  post_saved,
+  private_message,
+  site,
+  user_,
+  user_ban,
+  user_fast,
+  user_mention,
 );
diff --git a/src/main.rs b/src/main.rs
index 31c5f970..77063185 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -98,6 +98,6 @@ async fn main() -> Result<(), LemmyError> {
 fn init() {
   use lemmy_db::tests::establish_unpooled_connection;
   let conn = establish_unpooled_connection();
-    embedded_migrations::run(&conn).unwrap();
-    run_advanced_migrations(&conn).unwrap();
-}
\ No newline at end of file
+  embedded_migrations::run(&conn).unwrap();
+  run_advanced_migrations(&conn).unwrap();
+}
-- 
2.44.1