From 2e4b929fb5873dafabf4d7ba07859a7b94a83576 Mon Sep 17 00:00:00 2001
From: Gunwant Jain <mail@wantguns.dev>
Date: Thu, 21 Jan 2021 16:34:59 +0530
Subject: [PATCH] `cargo fix` the project

Make use of clippy and rustfmt

Signed-off-by: Gunwant Jain <mail@wantguns.dev>
---
 src/main.rs     | 41 +++++++++++++++++++++++++++--------------
 src/paste_id.rs |  4 ++--
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index a20292b..2bf734d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,19 +1,20 @@
 #![feature(proc_macro_hygiene, decl_macro)]
-#[macro_use] extern crate rocket;
+#[macro_use]
+extern crate rocket;
 
 extern crate tree_magic;
 
-use std::env;
-use std::io::prelude::*;
 use std::collections::HashMap;
-use std::path::Path;
+use std::env;
 use std::fs;
 use std::fs::File;
+use std::io::prelude::*;
+use std::path::Path;
 
-use rocket_contrib::templates::Template;
 use rocket::request::Form;
 use rocket::response::Redirect;
 use rocket::Data;
+use rocket_contrib::templates::Template;
 
 mod paste_id;
 
@@ -36,8 +37,8 @@ fn pretty_retrieve(id: PasteId) -> Option<Template> {
     let rendered = Template::render("pretty", &map);
 
     match tree_magic::match_filepath("text/plain", filepath) {
-        true    =>  Some(rendered),
-        false   =>  None
+        true => Some(rendered),
+        false => None,
     }
 }
 
@@ -59,12 +60,21 @@ fn upload(paste: Data) -> Result<String, std::io::Error> {
     //      Look into using open(), take() methods in the Data struct
     paste.stream_to_file(filepath)?;
 
-    let url = match tree_magic::from_filepath(filepath).as_str().contains("text") {
-        true    => format!("https://{host}/p/{id}\n", host = env::var("HOST_URL")
-            .unwrap_or("<no_host_provided>".to_string()), id = id),
+    let url = match tree_magic::from_filepath(filepath)
+        .as_str()
+        .contains("text")
+    {
+        true => format!(
+            "https://{host}/p/{id}\n",
+            host = env::var("HOST_URL").unwrap_or("<no_host_provided>".to_string()),
+            id = id
+        ),
 
-        false   => format!("https://{host}/{id}\n", host = env::var("HOST_URL")
-            .unwrap_or("http://localhost:8000".to_string()), id = id)
+        false => format!(
+            "https://{host}/{id}\n",
+            host = env::var("HOST_URL").unwrap_or("http://localhost:8000".to_string()),
+            id = id
+        ),
     };
 
     Ok(url)
@@ -78,7 +88,7 @@ struct PasteIdForm {
 #[post("/submit", data = "<paste>")]
 fn submit(paste: Form<PasteIdForm>) -> Redirect {
     let id = PasteId::new(4);
-    
+
     let filename = format!("upload/{id}", id = id);
     let content = paste.into_inner().val;
 
@@ -96,7 +106,10 @@ fn index() -> Option<Template> {
 
 fn main() {
     rocket::ignite()
-        .mount("/", routes![index, upload, submit, retrieve, pretty_retrieve])
+        .mount(
+            "/",
+            routes![index, upload, submit, retrieve, pretty_retrieve],
+        )
         .attach(Template::fairing())
         .launch();
 }
diff --git a/src/paste_id.rs b/src/paste_id.rs
index 350f686..a0fab41 100644
--- a/src/paste_id.rs
+++ b/src/paste_id.rs
@@ -21,7 +21,7 @@ impl<'a> PasteId<'a> {
             .collect();
 
         PasteId(Cow::Owned(id))
-    }    
+    }
 }
 
 impl<'a> FromParam<'a> for PasteId<'a> {
@@ -30,7 +30,7 @@ impl<'a> FromParam<'a> for PasteId<'a> {
     fn from_param(param: &'a RawStr) -> Result<Self, Self::Error> {
         match valid_id(param) {
             true => Ok(PasteId(Cow::Borrowed(param))),
-            false => Err(param)
+            false => Err(param),
         }
     }
 }