Reorganize uses

src/models/blog_authors.rs

@@ -1,5 +1,5 @@
-use diesel;
-use diesel::{QueryDsl, RunQueryDsl, ExpressionMethods, PgConnection};
+use diesel::{self, QueryDsl, RunQueryDsl, ExpressionMethods, PgConnection};
+
 use schema::blog_authors;
 
 #[derive(Queryable, Identifiable)]

src/models/blogs.rs

@@ -1,9 +1,10 @@
-use diesel;
-use diesel::{QueryDsl, RunQueryDsl, ExpressionMethods, PgConnection};
-use schema::blogs;
-use activity_pub::{Actor, ActorType};
-use models::instance::Instance;
+use diesel::{self, QueryDsl, RunQueryDsl, ExpressionMethods, PgConnection};
+
+use activity_pub::actor::{Actor, ActorType};
 use activity_pub::webfinger::*;
+use models::instance::Instance;
+use schema::blogs;
+
 
 #[derive(Queryable, Identifiable)]
 pub struct Blog {

src/models/instance.rs

@@ -1,8 +1,8 @@
-use diesel;
-use diesel::{ QueryDsl, RunQueryDsl, ExpressionMethods, PgConnection };
+use diesel::{self, QueryDsl, RunQueryDsl, ExpressionMethods, PgConnection};
 use std::iter::Iterator;
-use schema::{instances, users};
+
 use models::users::User;
+use schema::{instances, users};
 
 #[derive(Identifiable, Queryable)]
 pub struct Instance {

src/models/post_authors.rs

@@ -1,5 +1,5 @@
-use diesel;
-use diesel::{PgConnection, QueryDsl, RunQueryDsl, ExpressionMethods};
+use diesel::{self, PgConnection, QueryDsl, RunQueryDsl, ExpressionMethods};
+
 use schema::post_authors;
 
 #[derive(Queryable, Identifiable)]

src/models/posts.rs

@@ -1,5 +1,5 @@
-use diesel;
-use diesel::{PgConnection, RunQueryDsl, QueryDsl, ExpressionMethods};
+use diesel::{self, PgConnection, RunQueryDsl, QueryDsl, ExpressionMethods};
+
 use schema::posts;
 
 #[derive(Queryable, Identifiable)]

src/models/users.rs

@@ -1,14 +1,13 @@
-use rocket::request;
-use rocket::request::{FromRequest, Request};
-use rocket::outcome::IntoOutcome;
-use diesel;
-use diesel::{QueryDsl, RunQueryDsl, ExpressionMethods, PgConnection};
-use schema::users;
-use db_conn::DbConn;
-use activity_pub::{ActorType, Actor};
-use models::instance::Instance;
 use bcrypt;
+use diesel::{self, QueryDsl, RunQueryDsl, ExpressionMethods, PgConnection};
+use rocket::request::{self, FromRequest, Request};
+use rocket::outcome::IntoOutcome;
+
+use activity_pub::actor::{ActorType, Actor};
 use activity_pub::webfinger::Webfinger;
+use db_conn::DbConn;
+use models::instance::Instance;
+use schema::users;
 
 pub const AUTH_COOKIE: &'static str = "user_id";