From acba660c37ed22b259f86fbf5a678d15c316bf0b Mon Sep 17 00:00:00 2001
From: "Aode (Lion)" <asonix@asonix.dog>
Date: Mon, 13 Sep 2021 20:50:51 -0500
Subject: [PATCH] Update to latest actix-form-data

---
 Cargo.lock   |  6 +++---
 Cargo.toml   |  2 +-
 src/error.rs | 12 +-----------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3532546..0bf5efa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,9 +20,9 @@ dependencies = [
 
 [[package]]
 name = "actix-form-data"
-version = "0.6.0-beta.8"
+version = "0.6.0-beta.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "304d237617d707993b9210dfaa2c5243ac8bcda5ed1b7a5b6f3b404a4f31a2f3"
+checksum = "ac713cbe809a8627fd8af30292b2881080d8d008559330f4e49f039800a963ed"
 dependencies = [
  "actix-multipart",
  "actix-rt",
@@ -1007,7 +1007,7 @@ dependencies = [
 
 [[package]]
 name = "pict-rs"
-version = "0.3.0-alpha.31"
+version = "0.3.0-alpha.32"
 dependencies = [
  "actix-form-data",
  "actix-rt",
diff --git a/Cargo.toml b/Cargo.toml
index 111ece7..c9ffb37 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pict-rs"
 description = "A simple image hosting service"
-version = "0.3.0-alpha.31"
+version = "0.3.0-alpha.32"
 authors = ["asonix <asonix@asonix.dog>"]
 license = "AGPL-3.0"
 readme = "README.md"
diff --git a/src/error.rs b/src/error.rs
index 6fd4451..d5c73a8 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -55,7 +55,7 @@ impl From<sled::transaction::TransactionError<Error>> for Error {
 #[derive(Debug, thiserror::Error)]
 pub(crate) enum UploadError {
     #[error("Couln't upload file, {0}")]
-    Upload(String),
+    Upload(#[from] actix_form_data::Error),
 
     #[error("Error in DB, {0}")]
     Db(#[from] sled::Error),
@@ -130,16 +130,6 @@ impl From<awc::error::SendRequestError> for UploadError {
     }
 }
 
-impl From<actix_form_data::Error<Error>> for Error {
-    fn from(e: actix_form_data::Error<Error>) -> Self {
-        if let actix_form_data::Error::FileFn(e) = e {
-            return e;
-        }
-
-        UploadError::Upload(e.to_string()).into()
-    }
-}
-
 impl From<actix_web::error::BlockingError> for UploadError {
     fn from(_: actix_web::error::BlockingError) -> Self {
         UploadError::Canceled