From 8b0d35987af077ce8d5d26909892fddf49dc1cc3 Mon Sep 17 00:00:00 2001
From: famfo <famfo@protonmail.com>
Date: Wed, 11 May 2022 11:26:44 +0200
Subject: [PATCH] Rustfmt moment

---
 src/database.rs  |  4 ++--
 src/task.rs      |  1 -
 src/templates.rs |  1 -
 src/web.rs       | 48 ++++++++++++++++++++++++++++++------------------
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/database.rs b/src/database.rs
index 318f814..bae3d25 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -17,13 +17,13 @@
  */
 
 use crate::templates;
+use argon2::Argon2;
 use argon2::PasswordHasher;
 use sqlx::postgres::{PgConnectOptions, PgConnectionInfo, PgPoolOptions};
 use sqlx::Executor;
 use sqlx::{ConnectOptions, PgPool};
 use tracing::info;
 use tracing::log::LevelFilter;
-use argon2::Argon2;
 
 pub struct Database(PgPool, String);
 
@@ -86,7 +86,7 @@ impl Database {
             return;
         }
         tracing::debug!("{}", hash.unwrap());
-        // TODO: insert into DB 
+        // TODO: insert into DB
     }
 
     pub async fn login(&self, username: &str, password: &str) {
diff --git a/src/task.rs b/src/task.rs
index 9b5e267..3ab7790 100644
--- a/src/task.rs
+++ b/src/task.rs
@@ -48,4 +48,3 @@ pub struct Register {
     pub username: String,
     pub password: String,
 }
-
diff --git a/src/templates.rs b/src/templates.rs
index 7138a12..c93cad4 100644
--- a/src/templates.rs
+++ b/src/templates.rs
@@ -48,4 +48,3 @@ pub struct Login();
 #[template(path = "register.html")]
 
 pub struct Register();
-
diff --git a/src/web.rs b/src/web.rs
index ed0f082..1d1e6e0 100644
--- a/src/web.rs
+++ b/src/web.rs
@@ -16,7 +16,7 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use crate::{task, templates, database::Database};
+use crate::{database::Database, task, templates};
 use actix_web::{http::StatusCode, web, HttpResponse, HttpResponseBuilder, HttpServer, Responder};
 use askama::Template;
 use std::net::SocketAddr;
@@ -34,12 +34,9 @@ impl App {
                 web::resource("/task")
                     .app_data(web::Data::new(db.clone()))
                     .route(web::get().to(task)),
-                web::resource("/create")
-                    .route(web::get().to(create)),
-                web::resource("/login")
-                    .route(web::get().to(login)),
-                web::resource("/register")
-                    .route(web::get().to(register)),
+                web::resource("/create").route(web::get().to(create)),
+                web::resource("/login").route(web::get().to(login)),
+                web::resource("/register").route(web::get().to(register)),
                 web::resource("/api/task/create")
                     .app_data(web::Data::new(db.clone()))
                     .route(web::post().to(create_task)),
@@ -70,48 +67,63 @@ async fn task(db: web::Data<Arc<Database>>) -> impl Responder {
 }
 
 async fn create() -> impl Responder {
-    let create = templates::CreateTask{};
+    let create = templates::CreateTask {};
     let html = create.render().unwrap();
     HttpResponseBuilder::new(StatusCode::OK).body(html)
 }
 
 async fn login() -> impl Responder {
-    let login = templates::Login{};
+    let login = templates::Login {};
     let html = login.render().unwrap();
     HttpResponseBuilder::new(StatusCode::OK).body(html)
 }
 
 async fn register() -> impl Responder {
-    let register = templates::Register{};
+    let register = templates::Register {};
     let html = register.render().unwrap();
     HttpResponseBuilder::new(StatusCode::OK).body(html)
 }
 
-async fn create_task(req: web::Form<task::CreateTask>, db: web::Data<Arc<Database>>) -> impl Responder {
+async fn create_task(
+    req: web::Form<task::CreateTask>,
+    db: web::Data<Arc<Database>>,
+) -> impl Responder {
     tracing::debug!("Got POST request on /api/task/create: {:#?}", req);
-    HttpResponse::SeeOther().insert_header(("Location", "/task")).finish()
+    HttpResponse::SeeOther()
+        .insert_header(("Location", "/task"))
+        .finish()
 }
 
 async fn move_task(req: web::Form<task::MoveTask>, db: web::Data<Arc<Database>>) -> impl Responder {
     tracing::debug!("Got POST request on /api/task/move: {:#?}", req);
-    HttpResponse::SeeOther().insert_header(("Location", "/task")).finish()
+    HttpResponse::SeeOther()
+        .insert_header(("Location", "/task"))
+        .finish()
 }
 
 async fn sort_task(req: web::Form<task::SortTask>, db: web::Data<Arc<Database>>) -> impl Responder {
     tracing::debug!("Got POST request on /api/task/sort: {:#?}", req);
-    HttpResponse::SeeOther().insert_header(("Location", "/task")).finish()
+    HttpResponse::SeeOther()
+        .insert_header(("Location", "/task"))
+        .finish()
 }
 
 async fn login_user(req: web::Form<task::Login>, db: web::Data<Arc<Database>>) -> impl Responder {
     tracing::debug!("Got POST request on /api/login");
     db.login(&req.username, &req.password).await;
-    HttpResponse::SeeOther().insert_header(("Location", "/task")).finish()
+    HttpResponse::SeeOther()
+        .insert_header(("Location", "/task"))
+        .finish()
 }
 
-async fn register_user(req: web::Form<task::Register>, db: web::Data<Arc<Database>>) -> impl Responder {
+async fn register_user(
+    req: web::Form<task::Register>,
+    db: web::Data<Arc<Database>>,
+) -> impl Responder {
     tracing::debug!("Got POST request on /api/register");
     let db = db.clone();
     db.register(&req.username, &req.password).await;
-    HttpResponse::SeeOther().insert_header(("Location", "/task")).finish()
+    HttpResponse::SeeOther()
+        .insert_header(("Location", "/task"))
+        .finish()
 }
-