Run rustfmt on project.

4 files changed, 79 insertions, 102 deletions

diff --git a/src/controllers/home_controller.rs b/src/controllers/home_controller.rs
index fb88d07..ba2ea0c 100644
--- a/src/controllers/home_controller.rs
+++ b/src/controllers/home_controller.rs
@@ -1,21 +1,14 @@
 use models::Post;
-use utils::{
-    DbConn,
-    Page
-};
-use rocket::{
-    response::NamedFile,
-    request::FlashMessage,
-    Route
-};
+use posts_controller::ShowPostTemplate;
+use rocket::{request::FlashMessage, response::NamedFile, Route};
 use rocket_contrib::Json;
 use std::path::PathBuf;
-use posts_controller::ShowPostTemplate;
+use utils::{DbConn, Page};
 
 #[derive(BartDisplay)]
 #[template = "templates/index.html"]
 struct IndexTemplate {
-    posts: Vec<ShowPostTemplate>
+    posts: Vec<ShowPostTemplate>,
 }
 
 implement_responder_for!(IndexTemplate);
@@ -26,10 +19,11 @@ fn index(flash: Option<FlashMessage>, conn: DbConn) -> Page<IndexTemplate> {
         title: String::from("Bloggen"),
         flash: flash,
         content: IndexTemplate {
-            posts: Post::get_all(conn).into_iter()
+            posts: Post::get_all(conn)
+                .into_iter()
                 .map(|p| ShowPostTemplate { post: p })
-                .collect()
-        }
+                .collect(),
+        },
     }
 }
 
@@ -47,9 +41,5 @@ fn public_file(file: PathBuf) -> Option<NamedFile> {
 }
 
 pub fn routes() -> Vec<Route> {
-    routes![
-        index,
-        index_json,
-        public_file
-    ]
+    routes![index, index_json, public_file]
 }
diff --git a/src/controllers/login_controller.rs b/src/controllers/login_controller.rs
index 090d299..6ee5de1 100644
--- a/src/controllers/login_controller.rs
+++ b/src/controllers/login_controller.rs
@@ -1,13 +1,10 @@
+use models::User;
 use rocket::{
     request::{FlashMessage, Form},
     response::{Flash, Redirect},
-    Route
-};
-use models::User;
-use utils::{
-    DbConn,
-    Page
+    Route,
 };
+use utils::{DbConn, Page};
 
 #[derive(BartDisplay)]
 #[template = "templates/login.html"]
@@ -15,12 +12,12 @@ pub struct LoginTemplate;
 
 implement_responder_for!(LoginTemplate);
 
-#[get("/", format="text/html")]
+#[get("/", format = "text/html")]
 pub fn new(flash: Option<FlashMessage>) -> Page<LoginTemplate> {
     Page {
         title: String::from("Log in"),
         flash: flash,
-        content: LoginTemplate{}
+        content: LoginTemplate {},
     }
 }
 
@@ -30,12 +27,18 @@ pub struct LoginForm {
     password: String,
 }
 
-#[post("/create", data="<login>")]
+#[post("/create", data = "<login>")]
 pub fn create(login: Form<LoginForm>, conn: DbConn) -> Flash<Redirect> {
     let login = login.get();
     if let Ok(user) = User::by_email(&login.email, conn) {
         if user.password == login.password {
-            return Flash::success(Redirect::to("/"), format!("{} logged in successfully", user.realname.or(Some(user.username)).unwrap()));
+            return Flash::success(
+                Redirect::to("/"),
+                format!(
+                    "{} logged in successfully",
+                    user.realname.or(Some(user.username)).unwrap()
+                ),
+            );
         }
     }
 
diff --git a/src/controllers/posts_controller.rs b/src/controllers/posts_controller.rs
index 7e819b5..99ff651 100644
--- a/src/controllers/posts_controller.rs
+++ b/src/controllers/posts_controller.rs
@@ -1,22 +1,16 @@
 use comrak::{markdown_to_html, ComrakOptions};
+use models::{NewPost, Post};
 use rocket::{
-    response::{Flash, Redirect},
     request::Form,
-    Route
-};
-use models::{
-    NewPost,
-    Post
-};
-use utils::{
-    DbConn,
-    Page
+    response::{Flash, Redirect},
+    Route,
 };
+use utils::{DbConn, Page};
 
 #[derive(BartDisplay)]
 #[template = "templates/new_post.html"]
 pub struct NewPostTemplate {
-    post: NewPost
+    post: NewPost,
 }
 
 implement_responder_for!(NewPostTemplate);
@@ -27,12 +21,12 @@ fn new(_conn: DbConn) -> Page<NewPostTemplate> {
         title: String::from("New post"),
         flash: None,
         content: NewPostTemplate {
-            post: Default::default()
-        }
+            post: Default::default(),
+        },
     }
 }
 
-#[post("/create", data="<post>")]
+#[post("/create", data = "<post>")]
 fn create(post: Form<NewPost>, conn: DbConn) -> Flash<Redirect> {
     Post::create(post.get(), conn);
     Flash::success(Redirect::to("/"), "Post successfully created!")
@@ -41,7 +35,7 @@ fn create(post: Form<NewPost>, conn: DbConn) -> Flash<Redirect> {
 #[derive(BartDisplay)]
 #[template = "templates/show_post.html"]
 pub struct ShowPostTemplate {
-    pub post: Post
+    pub post: Post,
 }
 
 implement_responder_for!(ShowPostTemplate);
@@ -58,16 +52,14 @@ fn show(id: i32, conn: DbConn) -> Page<ShowPostTemplate> {
     Page {
         title: p.title.clone(),
         flash: None,
-        content: ShowPostTemplate {
-            post: p
-        },
+        content: ShowPostTemplate { post: p },
     }
 }
 
 #[derive(BartDisplay)]
 #[template = "templates/edit_post.html"]
 pub struct EditPostTemplate {
-    post: Post
+    post: Post,
 }
 
 implement_responder_for!(EditPostTemplate);
@@ -78,14 +70,14 @@ fn edit(id: i32, conn: DbConn) -> Page<EditPostTemplate> {
     Page {
         title: String::from("Edit post"),
         flash: None,
-        content: EditPostTemplate { post: p }
+        content: EditPostTemplate { post: p },
     }
 }
 
-#[post("/update", data="<post>")]
+#[post("/update", data = "<post>")]
 fn update(post: Form<Post>, conn: DbConn) -> Flash<Redirect> {
-  Post::update(post.get(), conn);
-  Flash::success(Redirect::to("/"), "Post updated successfully!")
+    Post::update(post.get(), conn);
+    Flash::success(Redirect::to("/"), "Post updated successfully!")
 }
 
 #[get("/<id>/delete", format = "text/html")]
@@ -95,12 +87,5 @@ fn delete(id: i32, conn: DbConn) -> Flash<Redirect> {
 }
 
 pub fn routes() -> Vec<Route> {
-    routes![
-        new,
-        create,
-        show,
-        edit,
-        update,
-        delete
-    ]
+    routes![new, create, show, edit, update, delete]
 }
diff --git a/src/controllers/users_controller.rs b/src/controllers/users_controller.rs
index 0dee68a..4713705 100644
--- a/src/controllers/users_controller.rs
+++ b/src/controllers/users_controller.rs
@@ -1,21 +1,15 @@
+use models::{NewUser, User};
 use rocket::{
-    response::{Flash, Redirect},
     request::{FlashMessage, Form},
-    Route
-};
-use models::{
-    NewUser,
-    User
-};
-use utils::{
-    DbConn,
-    Page
+    response::{Flash, Redirect},
+    Route,
 };
+use utils::{DbConn, Page};
 
 #[derive(BartDisplay)]
 #[template = "templates/users.html"]
 pub struct UsersTemplate {
-    users: Vec<User>
+    users: Vec<User>,
 }
 
 implement_responder_for!(UsersTemplate);
@@ -26,15 +20,15 @@ fn index(flash: Option<FlashMessage>, conn: DbConn) -> Page<UsersTemplate> {
         title: String::from("Users"),
         flash: flash,
         content: UsersTemplate {
-            users: User::all(conn).unwrap()
-        }
+            users: User::all(conn).unwrap(),
+        },
     }
 }
 
 #[derive(BartDisplay)]
 #[template = "templates/edit_user.html"]
 pub struct EditUserTemplate {
-    user: User
+    user: User,
 }
 
 implement_responder_for!(EditUserTemplate);
@@ -45,8 +39,8 @@ fn edit(id: i32, conn: DbConn) -> Page<EditUserTemplate> {
         title: String::from("Edit users"),
         flash: None,
         content: EditUserTemplate {
-            user: User::by_id(id, &conn).unwrap()
-        }
+            user: User::by_id(id, &conn).unwrap(),
+        },
     }
 }
 
@@ -55,19 +49,19 @@ fn delete(id: i32, route: &Route, conn: DbConn) -> Flash<Redirect> {
     match User::delete(id, conn) {
         Ok(user) => Flash::success(
             Redirect::to(route.base.path()),
-            format!("User {} was successfully deleted.", user.username)
+            format!("User {} was successfully deleted.", user.username),
         ),
         Err(msg) => Flash::error(
             Redirect::to(route.base.path()),
-            format!("Error deleting user: {}", msg)
-        )
+            format!("Error deleting user: {}", msg),
+        ),
     }
 }
 
 #[derive(BartDisplay)]
 #[template = "templates/new_user.html"]
 pub struct NewUserTemplate {
-    user: NewUser
+    user: NewUser,
 }
 
 implement_responder_for!(NewUserTemplate);
@@ -78,8 +72,8 @@ fn new(flash: Option<FlashMessage>) -> Page<NewUserTemplate> {
         title: String::from("New user"),
         flash: flash,
         content: NewUserTemplate {
-            user: Default::default()
-        }
+            user: Default::default(),
+        },
     }
 }
 
@@ -89,7 +83,7 @@ struct RegisterUserForm {
     realname: Option<String>,
     email: Option<String>,
     password: String,
-    password_confirm: String
+    password_confirm: String,
 }
 
 impl RegisterUserForm {
@@ -102,7 +96,7 @@ impl RegisterUserForm {
                 username: self.username.clone(),
                 realname: self.realname.clone(),
                 email: self.email.clone(),
-                password: self.password.clone()
+                password: self.password.clone(),
             })
         }
     }
@@ -117,27 +111,33 @@ impl RegisterUserForm {
                 username: self.username.clone(),
                 realname: self.realname.clone(),
                 email: self.email.clone(),
-                password: self.password.clone()
+                password: self.password.clone(),
             })
         }
     }
 }
 
-#[post("/create", data="<user>")]
+#[post("/create", data = "<user>")]
 fn create(user: Form<RegisterUserForm>, route: &Route, conn: DbConn) -> Flash<Redirect> {
     match user.get().new_user() {
-        Ok(new_user) => {
-            match User::create(&new_user, conn) {
-                Ok(_) => Flash::success(Redirect::to(route.base.path()), "User successfully created!"),
-                Err(_) => Flash::error(Redirect::to("/"), "Could not create user!")
-            }
+        Ok(new_user) => match User::create(&new_user, conn) {
+            Ok(_) => Flash::success(
+                Redirect::to(route.base.path()),
+                "User successfully created!",
+            ),
+            Err(_) => Flash::error(Redirect::to("/"), "Could not create user!"),
         },
-        Err(msg) => Flash::error(Redirect::to(&format!("{}/new", route.base.path())), &msg)
+        Err(msg) => Flash::error(Redirect::to(&format!("{}/new", route.base.path())), &msg),
     }
 }
 
-#[post("/<id>/update", data="<user_form>")]
-fn update(id: i32, user_form: Form<RegisterUserForm>, route: &Route, conn: DbConn) -> Flash<Redirect> {
+#[post("/<id>/update", data = "<user_form>")]
+fn update(
+    id: i32,
+    user_form: Form<RegisterUserForm>,
+    route: &Route,
+    conn: DbConn,
+) -> Flash<Redirect> {
     match user_form.get().attrs() {
         Ok(attrs) => {
             if let Ok(mut user) = User::by_id(id, &conn) {
@@ -156,26 +156,25 @@ fn update(id: i32, user_form: Form<RegisterUserForm>, route: &Route, conn: DbCon
                 match User::update(&user, &conn) {
                     Ok(user) => Flash::success(
                         Redirect::to(route.base.path()),
-                        format!("User {} updated successfully", user.username)
+                        format!("User {} updated successfully", user.username),
                     ),
                     Err(msg) => Flash::error(
                         Redirect::to(route.base.path()),
-                        format!("User {} was not updated! {}", user.username, msg)
-                    )
-
+                        format!("User {} was not updated! {}", user.username, msg),
+                    ),
                 }
             }
             else {
                 Flash::error(
                     Redirect::to(route.base.path()),
-                    "Can't delete users which does not exist"
+                    "Can't delete users which does not exist",
                 )
             }
-        },
+        }
         Err(msg) => Flash::error(
             Redirect::to(route.base.path()),
-            format!("Invalid form data: {}", msg)
-        )
+            format!("Invalid form data: {}", msg),
+        ),
     }
 }