Reorganize use statements

src/routes/blogs.rs

@@ -1,17 +1,20 @@
 use activitystreams_types::collection::OrderedCollection;
-use rocket::request::Form;
-use rocket::response::Redirect;
+use rocket::{
+    request::Form,
+    response::Redirect
+};
 use rocket_contrib::Template;
 use serde_json;
 
-use activity_pub::{ActivityStream, ActivityPub};
-use activity_pub::actor::Actor;
+use activity_pub::{ActivityStream, ActivityPub, actor::Actor};
 use db_conn::DbConn;
-use models::blog_authors::*;
-use models::blogs::*;
-use models::instance::Instance;
-use models::posts::Post;
-use models::users::User;
+use models::{
+    blog_authors::*,
+    blogs::*,
+    instance::Instance,
+    posts::Post,
+    users::User
+};
 use utils;
 
 #[get("/~/<name>", rank = 2)]

src/routes/comments.rs

@@ -1,12 +1,13 @@
-use rocket::request::Form;
-use rocket::response::Redirect;
+use rocket::{ request::Form, response::Redirect};
 use rocket_contrib::Template;
 
 use activity_pub::broadcast;
 use db_conn::DbConn;
-use models::comments::*;
-use models::posts::Post;
-use models::users::User;
+use models::{
+    comments::*,
+    posts::Post,
+    users::User
+};
 
 #[get("/~/<_blog>/<slug>/comment")]
 fn new(_blog: String, slug: String, user: User, conn: DbConn) -> Template {

src/routes/instance.rs

@@ -1,14 +1,15 @@
-use rocket::request::Form;
-use rocket::response::Redirect;
+use rocket::{request::Form, response::Redirect};
 use rocket_contrib::Template;
 use serde_json;
 
 use BASE_URL;
 use activity_pub::inbox::Inbox;
 use db_conn::DbConn;
-use models::posts::Post;
-use models::users::User;
-use models::instance::*;
+use models::{
+    posts::Post,
+    users::User,
+    instance::*
+};
 
 #[get("/")]
 fn index(conn: DbConn, user: Option<User>) -> Template {

src/routes/likes.rs

@@ -2,9 +2,11 @@ use rocket::response::Redirect;
 
 use activity_pub::broadcast;
 use db_conn::DbConn;
-use models::likes;
-use models::posts::Post;
-use models::users::User;
+use models::{
+    likes,
+    posts::Post,
+    users::User
+};
 
 #[get("/~/<blog>/<slug>/like")]
 fn create(blog: String, slug: String, user: User, conn: DbConn) -> Redirect {

src/routes/notifications.rs

@@ -1,8 +1,7 @@
 use rocket_contrib::Template;
 
 use db_conn::DbConn;
-use models::notifications::Notification;
-use models::users::User;
+use models::{notifications::Notification, users::User};
 
 #[get("/notifications")]
 fn notifications(conn: DbConn, user: User) -> Template {

src/routes/posts.rs

@@ -4,14 +4,15 @@ use rocket::response::Redirect;
 use rocket_contrib::Template;
 use serde_json;
 
-use activity_pub::{broadcast, context, activity_pub, ActivityPub};
-use activity_pub::object::Object;
+use activity_pub::{broadcast, context, activity_pub, ActivityPub, object::Object};
 use db_conn::DbConn;
-use models::blogs::*;
-use models::comments::Comment;
-use models::post_authors::*;
-use models::posts::*;
-use models::users::User;
+use models::{
+    blogs::*,
+    comments::Comment,
+    post_authors::*,
+    posts::*,
+    users::User
+};
 use utils;
 
 #[get("/~/<blog>/<slug>", rank = 4)]

src/routes/session.rs

@@ -1,7 +1,8 @@
-use rocket::http::{Cookie, Cookies};
-use rocket::response::Redirect;
-use rocket::response::status::NotFound;
-use rocket::request::Form;
+use rocket::{
+    http::{Cookie, Cookies},
+    response::{Redirect, status::NotFound},
+    request::Form
+};
 use rocket_contrib::Template;
 
 use db_conn::DbConn;

src/routes/user.rs

@@ -2,19 +2,22 @@ use activitystreams_types::{
     activity::Follow,
     collection::OrderedCollection
 };
-use rocket::request::Form;
-use rocket::response::Redirect;
+use rocket::{request::Form, response::Redirect};
 use rocket_contrib::Template;
 use serde_json;
 
-use activity_pub::{activity_pub, ActivityPub, ActivityStream, context, broadcast, Id, IntoId};
-use activity_pub::actor::Actor;
-use activity_pub::inbox::Inbox;
+use activity_pub::{
+    activity_pub, ActivityPub, ActivityStream, context, broadcast, Id, IntoId,
+    actor::Actor,
+    object::Object
+};
 use db_conn::DbConn;
-use models::follows;
-use models::instance::Instance;
-use models::posts::Post;
-use models::users::*;
+use models::{
+    follows,
+    instance::Instance,
+    posts::Post,
+    users::*
+};
 
 #[get("/me")]
 fn me(user: User) -> Redirect {

src/routes/well_known.rs

@@ -2,11 +2,9 @@ use rocket::http::ContentType;
 use rocket::response::Content;
 
 use BASE_URL;
-use activity_pub::ap_url;
-use activity_pub::webfinger::Webfinger;
+use activity_pub::{ap_url, webfinger::Webfinger};
 use db_conn::DbConn;
-use models::blogs::Blog;
-use models::users::User;
+use models::{blogs::Blog, users::User};
 
 #[get("/.well-known/host-meta", format = "application/xml")]
 fn host_meta() -> String {