proxmox-mirrors/perlmod
1
0
Fork 0
mirror of https://git.proxmox.com/git/perlmod synced 2025-10-04 21:26:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

macro: add newlines to errors

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2021-06-30 08:14:47 +02:00
parent 36bbf1d1a1
commit aa13c5c85b
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
perlmod-macro/src/function.rs
View File

@ -113,7 +113,8 @@ pub fn handle_function(
let deserialized_name = let deserialized_name =
Ident::new(&format!("deserialized_arg_{}", arg_name), arg_name.span()); Ident::new(&format!("deserialized_arg_{}", arg_name), arg_name.span());
let missing_message = syn::LitStr::new("missing required parameter: '{}'", arg_name.span()); let missing_message =
syn::LitStr::new("missing required parameter: '{}'\n", arg_name.span());
extract_arguments.extend(quote! { extract_arguments.extend(quote! {
let #extracted_name: ::perlmod::Value = match args.next() { let #extracted_name: ::perlmod::Value = match args.next() {
@ -136,7 +137,7 @@ pub fn handle_function(
match ::std::convert::TryFrom::try_from(&#extracted_name) { match ::std::convert::TryFrom::try_from(&#extracted_name) {
Ok(arg) => arg, Ok(arg) => arg,
Err(err) => { Err(err) => {
return Err(::perlmod::Value::new_string(&err.to_string()) return Err(::perlmod::Value::new_string(&format!("{}\n", err))
.into_mortal() .into_mortal()
.into_raw()); .into_raw());
} }
@ -148,7 +149,7 @@ pub fn handle_function(
match ::perlmod::from_ref_value(&#extracted_name) { match ::perlmod::from_ref_value(&#extracted_name) {
Ok(data) => data, Ok(data) => data,
Err(err) => { Err(err) => {
return Err(::perlmod::Value::new_string(&err.to_string()) return Err(::perlmod::Value::new_string(&format!("{}\n", err))
.into_mortal() .into_mortal()
.into_raw()); .into_raw());
} }
@ -174,7 +175,7 @@ pub fn handle_function(
let too_many_args_error = syn::LitStr::new( let too_many_args_error = syn::LitStr::new(
&format!( &format!(
"too many parameters for function '{}', (expected {})", "too many parameters for function '{}', (expected {})\n",
name, name,
func.sig.inputs.len() func.sig.inputs.len()
), ),
@ -266,7 +267,7 @@ fn handle_return_kind(
match #name(#passed_arguments) { match #name(#passed_arguments) {
Ok(()) => (), Ok(()) => (),
Err(err) => { Err(err) => {
return Err(::perlmod::Value::new_string(&err.to_string()) return Err(::perlmod::Value::new_string(&format!("{}\n", err))
.into_mortal() .into_mortal()
.into_raw()); .into_raw());
} }
@ -303,7 +304,7 @@ fn handle_return_kind(
let result = match #name(#passed_arguments) { let result = match #name(#passed_arguments) {
Ok(output) => output, Ok(output) => output,
Err(err) => { Err(err) => {
return Err(::perlmod::Value::new_string(&err.to_string()) return Err(::perlmod::Value::new_string(&format!("{}\n", err))
.into_mortal() .into_mortal()
.into_raw()); .into_raw());
} }
@ -323,7 +324,7 @@ fn handle_return_kind(
handle_return.extend(quote! { handle_return.extend(quote! {
match ::perlmod::to_value(&result) { match ::perlmod::to_value(&result) {
Ok(value) => Ok(value.into_mortal().into_raw()), Ok(value) => Ok(value.into_mortal().into_raw()),
Err(err) => Err(::perlmod::Value::new_string(&err.to_string()) Err(err) => Err(::perlmod::Value::new_string(&format!("{}\n", err))
.into_mortal() .into_mortal()
.into_raw()), .into_raw()),
} }
@ -357,7 +358,7 @@ fn handle_return_kind(
let result = match #name(#passed_arguments) { let result = match #name(#passed_arguments) {
Ok(output) => output, Ok(output) => output,
Err(err) => { Err(err) => {
return Err(::perlmod::Value::new_string(&err.to_string()) return Err(::perlmod::Value::new_string(&format!("{}\n", err))
.into_mortal() .into_mortal()
.into_raw()); .into_raw());
} }
@ -385,9 +386,10 @@ fn handle_return_kind(
rt.extend(quote! { rt.extend(quote! {
match ::perlmod::to_value(&result.#i) { match ::perlmod::to_value(&result.#i) {
Ok(value) => value.into_mortal().into_raw(), Ok(value) => value.into_mortal().into_raw(),
Err(err) => return Err(::perlmod::Value::new_string(&err.to_string()) Err(err) => return
.into_mortal() Err(::perlmod::Value::new_string(&format!("{}\n", err))
.into_raw()), .into_mortal()
.into_raw()),
}, },
}); });
} }