Fix: #[Query]

ohkami-rs · Dec 25, 2023 · 2e6b17f · 2e6b17f
1 parent fc359b8
commit 2e6b17f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ohkami_macros/src/payload.rs b/ohkami_macros/src/payload.rs
@@ -120,7 +120,7 @@ fn impl_payload_formdata(data: &ItemStruct) -> Result<TokenStream> {
 
     // `#[Payload(Form)]` doesn't accept optional fields
     if fields_data.iter().any(|FieldData { is_optional, .. }| *is_optional) {
-        return Err(syn::Error::new(Span::mixed_site(), "`Option<_>` is not available in `#[Payload(FormData)]`"))
+        return Err(syn::Error::new(Span::mixed_site(), "`Option<_>` is not available in `#[Payload(Form)]`"))
     }
 
     let declaring_exprs = {
@@ -152,7 +152,7 @@ fn impl_payload_formdata(data: &ItemStruct) -> Result<TokenStream> {
                 "String" => PartType::Field,
                 "File" | "utils::File" | "ohkami::File" | "::ohkami::File" => PartType::File,
                 "Vec<File>" | "Vec<utils::File>" | "Vec<ohkami::utils::File>" | "Vec<::ohkami::utils::File>" => PartType::Files,
-                unexpected  => return Err(syn::Error::new(Span::call_site(), &format!("Unexpected field type `{unexpected}` : `#[Payload(FormData)]` supports only `String`, `File` or `Vec<File>` as field type")))
+                unexpected  => return Err(syn::Error::new(Span::call_site(), &format!("Unexpected field type `{unexpected}` : `#[Payload(Form)]` supports only `String`, `File` or `Vec<File>` as field type")))
             }.into_method_call();
 
             Ok(quote!{

diff --git a/ohkami_macros/src/query.rs b/ohkami_macros/src/query.rs
@@ -24,15 +24,15 @@ pub(super) fn Query(data: TokenStream) -> Result<TokenStream> {
                 quote!{
                     #field_name: req.query::<#inner_type>(#field_name_str) // Option<Result<_>>
                         .transpose()
-                        .map_err(|e| e.to_string().into())?,
+                        .map_err(|e| ::std::borrow::Cow::Owned(e.to_string()))?,
                 }
             } else {
                 quote!{
                     #field_name: req.query::<#field_type>(#field_name_str) // Option<Result<_>>
                         .ok_or_else(|| ::std::borrow::Cow::Borrowed(
                             concat!("Expected query parameter `", #field_name_str, "`")
                         ))?
-                        .map_err(|e| e.to_string().into())?,
+                        .map_err(|e| ::std::borrow::Cow::Owned(e.to_string()))?,
                 }
             } 
         });