franklinblanco/actix-web-utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another attempt to fix macros

Browse Source
This commit is contained in:
Franklin 2022-08-31 13:45:01 -04:00
parent 92beac9893
commit b80c9b47fc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -183,7 +183,7 @@ dependencies = [
[[package]] [[package]]
name = "actix-web-utils" name = "actix-web-utils"
version = "0.2.6" version = "0.2.7"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"log", "log",

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-web-utils" name = "actix-web-utils"
version = "0.2.6" version = "0.2.7"
edition = "2021" edition = "2021"
authors = ["Franklin E. Blanco"] authors = ["Franklin E. Blanco"]
description = "Just some useful addons for actix web." description = "Just some useful addons for actix web."

6
src/utils/macros.rs
View File

@ -10,19 +10,19 @@ macro_rules! unwrap_or_return_handled_error {
( $e:expr, $type_of_resp:ty ) => { ( $e:expr, $type_of_resp:ty ) => {
match $e { match $e {
Ok(value) => value, Ok(value) => value,
Err(error) => return actix_web_utils::traits::macro_traits::ReturnableErrorShape::convert_to_returnable::<$type_of_resp>::(&error, 500) Err(error) => return actix_web_utils::traits::macro_traits::ReturnableErrorShape::convert_to_returnable::<$type_of_resp>(&error, 500)
} }
}; };
( $error_status_code:literal, $e:expr, $type_of_resp:ty ) => { ( $error_status_code:literal, $e:expr, $type_of_resp:ty ) => {
match $e { match $e {
Ok(value) => value, Ok(value) => value,
Err(error) => return actix_web_utils::traits::macro_traits::ReturnableErrorShape::convert_to_returnable::<$type_of_resp>::(&error, error_status_code) Err(error) => return actix_web_utils::traits::macro_traits::ReturnableErrorShape::convert_to_returnable::<$type_of_resp>(&error, error_status_code)
} }
}; };
( $error_status_code:literal, $success_status_code:literal, $e:expr, $type_of_resp:ty) => { ( $error_status_code:literal, $success_status_code:literal, $e:expr, $type_of_resp:ty) => {
match $e { match $e {
Ok(value) => return actix_web_utils::typed_response::TypedHttpResponse::return_standard_response($success_status_code, value), Ok(value) => return actix_web_utils::typed_response::TypedHttpResponse::return_standard_response($success_status_code, value),
Err(error) => return actix_web_utils::traits::macro_traits::ReturnableErrorShape::convert_to_returnable::<$type_of_resp>::(&error, error_status_code) Err(error) => return actix_web_utils::traits::macro_traits::ReturnableErrorShape::convert_to_returnable::<$type_of_resp>(&error, error_status_code)
} }
} }
} }