From 8a25cc65e4f9dfb48c5b3899db20ff53bc7dc144 Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Thu, 24 Feb 2022 01:02:46 +0300 Subject: [PATCH] fmt --- crates/it-json-serde/src/json_to_ivalues.rs | 11 ++++------ fluence-faas/src/errors.rs | 24 +++++++++------------ web-runtime/src/faas/errors.rs | 24 +++++++++------------ 3 files changed, 24 insertions(+), 35 deletions(-) diff --git a/crates/it-json-serde/src/json_to_ivalues.rs b/crates/it-json-serde/src/json_to_ivalues.rs index 900e468d..31536cb7 100644 --- a/crates/it-json-serde/src/json_to_ivalues.rs +++ b/crates/it-json-serde/src/json_to_ivalues.rs @@ -53,9 +53,9 @@ fn json_map_to_ivalues<'a, 'b>( let mut iargs = Vec::new(); for (arg_name, arg_type) in arg_types { - let json_value = json_map.remove(arg_name).ok_or_else(|| { - De(format!("missing argument with name {}", arg_name)) - })?; + let json_value = json_map + .remove(arg_name) + .ok_or_else(|| De(format!("missing argument with name {}", arg_name)))?; let iarg = jvalue_to_ivalue(json_value, arg_type, record_types)?; iargs.push(iarg); } @@ -173,10 +173,7 @@ fn jvalue_to_ivalue(jvalue: JValue, ty: &IType, record_types: &MRecordTypes) -> Ok(iargs) } - _ => Err(De(format!( - "expected bytearray, got {:?}", - jvalue - ))), + _ => Err(De(format!("expected bytearray, got {:?}", jvalue))), }?; Ok(IValue::Array(value)) diff --git a/fluence-faas/src/errors.rs b/fluence-faas/src/errors.rs index 3a1a5924..5c751d38 100644 --- a/fluence-faas/src/errors.rs +++ b/fluence-faas/src/errors.rs @@ -104,20 +104,16 @@ impl From for FaaSError { macro_rules! json_to_faas_err { ($json_expr:expr, $module_name:expr, $function_name:expr) => { $json_expr.map_err(|e| match e { - it_json_serde::ITJsonSeDeError::Se(_) => { - FaaSError::JsonOutputSerializationError { - module_name: $module_name, - function_name: $function_name, - error: e, - } - } - it_json_serde::ITJsonSeDeError::De(_) => { - FaaSError::JsonArgumentsDeserializationError { - module_name: $module_name, - function_name: $function_name, - error: e, - } - } + it_json_serde::ITJsonSeDeError::Se(_) => FaaSError::JsonOutputSerializationError { + module_name: $module_name, + function_name: $function_name, + error: e, + }, + it_json_serde::ITJsonSeDeError::De(_) => FaaSError::JsonArgumentsDeserializationError { + module_name: $module_name, + function_name: $function_name, + error: e, + }, }) }; } diff --git a/web-runtime/src/faas/errors.rs b/web-runtime/src/faas/errors.rs index e3889f3f..01707023 100644 --- a/web-runtime/src/faas/errors.rs +++ b/web-runtime/src/faas/errors.rs @@ -75,20 +75,16 @@ impl From for FaaSError { macro_rules! json_to_faas_err { ($json_expr:expr, $module_name:expr, $function_name:expr) => { $json_expr.map_err(|e| match e { - it_json_serde::ITJsonSeDeError::Se(_) => { - FaaSError::JsonOutputSerializationError { - module_name: $module_name, - function_name: $function_name, - error: e, - } - } - it_json_serde::ITJsonSeDeError::De(_) => { - FaaSError::JsonArgumentsDeserializationError { - module_name: $module_name, - function_name: $function_name, - error: e, - } - } + it_json_serde::ITJsonSeDeError::Se(_) => FaaSError::JsonOutputSerializationError { + module_name: $module_name, + function_name: $function_name, + error: e, + }, + it_json_serde::ITJsonSeDeError::De(_) => FaaSError::JsonArgumentsDeserializationError { + module_name: $module_name, + function_name: $function_name, + error: e, + }, }) }; }