Reorganize uses

src/routes/blogs.rs

@@ -3,13 +3,13 @@ use rocket::response::Redirect;
 use rocket_contrib::{Json, Template};
 use std::collections::HashMap;
 
-use utils;
+use activity_pub::actor::Actor;
 use db_conn::DbConn;
-use models::blogs::*;
 use models::blog_authors::*;
+use models::blogs::*;
 use models::instance::Instance;
 use models::users::User;
-use activity_pub::Actor;
+use utils;
 
 #[get("/~/<name>", rank = 2)]
 fn details(name: String) -> String {

src/routes/instance.rs

@@ -1,6 +1,6 @@
-use rocket_contrib::Template;
-use rocket::response::Redirect;
 use rocket::request::Form;
+use rocket::response::Redirect;
+use rocket_contrib::Template;
 use std::collections::HashMap;
 
 use db_conn::DbConn;

src/routes/mod.rs

@@ -1,6 +1,6 @@
 pub mod blogs;
 pub mod instance;
-pub mod session;
 pub mod posts;
+pub mod session;
 pub mod user;
 pub mod well_known;

src/routes/posts.rs

@@ -1,15 +1,15 @@
-use rocket::response::Redirect;
+use heck::KebabCase;
 use rocket::request::Form;
+use rocket::response::Redirect;
 use rocket_contrib::Template;
 use std::collections::HashMap;
-use heck::KebabCase;
 
-use utils;
 use db_conn::DbConn;
 use models::blogs::*;
-use models::posts::*;
 use models::post_authors::*;
+use models::posts::*;
 use models::users::User;
+use utils;
 
 #[get("/~/<blog>/<slug>", rank = 3)]
 fn details(blog: String, slug: String, conn: DbConn) -> String {
@@ -18,13 +18,13 @@ fn details(blog: String, slug: String, conn: DbConn) -> String {
     format!("{} in {}", post.title, blog.title)
 }
 
-#[get("/~/<blog>/new", rank = 1)]
-fn new(blog: String, user: User) -> Template {
+#[get("/~/<_blog>/new", rank = 1)]
+fn new(_blog: String, _user: User) -> Template {
     Template::render("posts/new", HashMap::<String, String>::new())
 }
 
-#[get("/~/<blog>/new", rank = 2)]
-fn new_auth(blog: String) -> Redirect {
+#[get("/~/<_blog>/new", rank = 2)]
+fn new_auth(_blog: String) -> Redirect {
     utils::requires_login()
 }
 

src/routes/session.rs

@@ -1,13 +1,12 @@
-use std::collections::HashMap;
-use rocket_contrib::Template;
+use rocket::http::{Cookie, Cookies};
 use rocket::response::Redirect;
-use rocket::request::Form;
-use models::users::User;
 use rocket::response::status::NotFound;
-use rocket::http::Cookies;
+use rocket::request::Form;
+use rocket_contrib::Template;
+use std::collections::HashMap;
+
 use db_conn::DbConn;
-use rocket::http::Cookie;
-use models::users::AUTH_COOKIE;
+use models::users::{User, AUTH_COOKIE};
 
 #[get("/login")]
 fn new() -> Template {

src/routes/user.rs

@@ -3,10 +3,10 @@ use rocket::response::Redirect;
 use rocket_contrib::{Json, Template};
 use std::collections::HashMap;
 
+use activity_pub::actor::Actor;
 use db_conn::DbConn;
-use models::users::*;
 use models::instance::Instance;
-use activity_pub::Actor;
+use models::users::*;
 
 #[get("/me")]
 fn me(user: User) -> String {

src/routes/well_known.rs

@@ -1,9 +1,8 @@
-use models::instance::Instance;
-use db_conn::DbConn;
-use models::users::User;
-use models::blogs::Blog;
-use rocket_contrib::Json;
 use activity_pub::webfinger::Webfinger;
+use db_conn::DbConn;
+use models::blogs::Blog;
+use models::instance::Instance;
+use models::users::User;
 
 #[get("/.well-known/host-meta", format = "application/xml")]
 fn host_meta(conn: DbConn) -> String {