format codes

src/errors.rs

@@ -44,12 +44,6 @@ impl From<std::num::ParseIntError> for ServiceError {
     }
 }
 
-impl Into<Status> for ServiceError {
-    fn into(self) -> Status {
-        self.status()
-    }
-}
-
 impl ServiceError {
     pub fn status(&self) -> Status {
         match self {

src/handlers/site.rs

@@ -1,4 +1,3 @@
-use rocket::form::validate::Len;
 use rocket_db_pools::Connection;
 use sqlx::{query, query_as, Row};
 

src/handlers/upload.rs

@@ -1,14 +1,14 @@
 use std::fs;
 use std::io;
-use std::path::PathBuf;
+use std::path::Path;
 
 use log::error;
 use rocket::fs::TempFile;
 use sha2::{Digest, Sha256};
 
 use crate::errors::ServiceError;
 
-pub async fn upload(file: &TempFile<'_>, path: &PathBuf) -> Result<String, ServiceError> {
+pub async fn upload(file: &TempFile<'_>, path: &Path) -> Result<String, ServiceError> {
     let content_type = match file.content_type() {
         Some(content_type) => content_type,
         None => {

src/routes/auth.rs

@@ -27,7 +27,7 @@ pub async fn login(
         .map_err(|e| {
             error!("{}", e);
 
-            e.into()
+            e.status()
         })?;
 
     Ok(response::auth::JwtToken { token })

src/routes/category.rs

@@ -33,7 +33,7 @@ pub async fn all(
         .map_err(|e| {
             error!("{}", e);
 
-            e.into()
+            e.status()
         })?;
 
     Ok(Json(result))
@@ -59,7 +59,7 @@ pub async fn update<'r>(
     update_category(id, &category, &mut db).await.map_err(|e| {
         error!("{}", e);
 
-        e.into()
+        e.status()
     })?;
 
     Ok(())
@@ -77,7 +77,7 @@ pub async fn add<'r>(
     let icon = standardize_url(category.icon, &config.upload_url);
 
     let icon = match icon {
-        Some(icon) => String::from(icon),
+        Some(icon) => icon,
         None => String::from(category.icon),
     };
 
@@ -86,22 +86,18 @@ pub async fn add<'r>(
     add_category(&category, &mut db).await.map_err(|e| {
         error!("{}", e);
 
-        e.into()
+        e.status()
     })?;
 
     Ok(())
 }
 
 #[delete("/<id>")]
-pub async fn delete<'r>(
-    id: &'r str,
-    mut db: Connection<Db>,
-    _jwt: JwtMiddleware,
-) -> Result<(), Status> {
+pub async fn delete(id: &str, mut db: Connection<Db>, _jwt: JwtMiddleware) -> Result<(), Status> {
     delete_category(id, &mut db).await.map_err(|e| {
         error!("{}", e);
 
-        e.into()
+        e.status()
     })?;
 
     Ok(())
@@ -118,7 +114,7 @@ pub async fn get_sites(
         .map_err(|e| {
             error!("{}", e);
 
-            e.into()
+            e.status()
         })?;
 
     Ok(Json(sites))

src/routes/site.rs

@@ -31,7 +31,7 @@ pub async fn all(
         .map_err(|e| {
             error!("{}", e);
 
-            e.into()
+            e.status()
         })?;
 
     Ok(Json(result))
@@ -49,7 +49,7 @@ pub async fn add(
     let icon = standardize_url(site.icon, &config.upload_url);
 
     let icon = match icon {
-        Some(icon) => String::from(icon),
+        Some(icon) => icon,
         None => String::from(site.icon),
     };
 
@@ -58,7 +58,7 @@ pub async fn add(
     site::add_site(&site, &mut db).await.map_err(|e| {
         error!("{}", e);
 
-        e.into()
+        e.status()
     })?;
 
     Ok(())
@@ -84,7 +84,7 @@ pub async fn update<'r>(
     site::update_site(id, &site, &mut db).await.map_err(|e| {
         error!("{}", e);
 
-        e.into()
+        e.status()
     })?;
 
     Ok(())
@@ -95,7 +95,7 @@ pub async fn delete(id: &str, mut db: Connection<Db>, _jwt: JwtMiddleware) -> Re
     site::delete_site(id, &mut db).await.map_err(|e| {
         error!("{}", e);
 
-        e.into()
+        e.status()
     })?;
 
     Ok(())

src/routes/upload.rs

@@ -26,7 +26,7 @@ pub async fn upload(
         .map_err(|e| {
             error!("{}", e);
 
-            e.into()
+            e.status()
         })?;
 
     Ok(Json(format!("{}/{}", config.upload_url, result)))

src/routes/user.rs

@@ -28,7 +28,7 @@ pub async fn me(
         .map_err(|e| {
             error!("{}", e);
 
-            e.into()
+            e.status()
         })?;
 
     Ok(Json(user))
@@ -54,7 +54,7 @@ pub async fn update(
     update_user(username, &user, &mut db).await.map_err(|e| {
         error!("{}", e);
 
-        e.into()
+        e.status()
     })?;
 
     Ok(())
@@ -72,7 +72,7 @@ pub async fn update_password<'r>(
         .map_err(|e| {
             error!("{}", e);
 
-            e.into()
+            e.status()
         })?;
 
     Ok(Logout)