From a317f1eabe1773b5ca146a79a56329477d2daa96 Mon Sep 17 00:00:00 2001 From: asonix Date: Sat, 17 Apr 2021 14:34:12 -0500 Subject: [PATCH] Update actix deps --- Cargo.toml | 2 +- src/error.rs | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2b0d22b..7bb7451 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "actix-form-data" description = "Multipart Form Data for Actix Web" -version = "0.6.0-beta.1" +version = "0.6.0-beta.2" license = "GPL-3.0" authors = ["asonix "] repository = "https://git.asonix.dog/Aardwolf/actix-form-data.git" diff --git a/src/error.rs b/src/error.rs index 0c4067b..2155aa6 100644 --- a/src/error.rs +++ b/src/error.rs @@ -24,9 +24,10 @@ use std::{ use actix_multipart::MultipartError; use actix_web::{ + dev::Body, error::{PayloadError, ResponseError}, http::StatusCode, - HttpResponse, + BaseHttpResponse, }; #[derive(Debug, thiserror::Error)] @@ -83,14 +84,14 @@ impl ResponseError for Error { } } - fn error_response(&self) -> HttpResponse { + fn error_response(&self) -> BaseHttpResponse { match *self { Error::FileFn(ref e) => ResponseError::error_response(e.as_response_error()), Error::Payload(ref e) => ResponseError::error_response(e), Error::Multipart(_) | Error::ParseField(_) | Error::ParseInt(_) - | Error::ParseFloat(_) => HttpResponse::BadRequest().finish(), + | Error::ParseFloat(_) => BaseHttpResponse::bad_request(), Error::ContentType | Error::ContentDisposition | Error::Field @@ -99,9 +100,9 @@ impl ResponseError for Error { | Error::FieldType | Error::Filename | Error::FileCount - | Error::FileSize => HttpResponse::BadRequest().finish(), + | Error::FileSize => BaseHttpResponse::bad_request(), Error::MissingMiddleware | Error::TxDropped => { - HttpResponse::InternalServerError().finish() + BaseHttpResponse::internal_server_error() } } }