This commit is contained in:
Sunli 2020-10-04 07:49:56 +08:00
parent 3581008e71
commit 22f7e09537
12 changed files with 20 additions and 20 deletions

View File

@ -75,7 +75,7 @@ pub fn generate(object_args: &args::InputObject) -> GeneratorResult<TokenStream>
get_fields.push(quote! {
let #ident: #ty = #crate_name::InputValueType::parse(
Some(#crate_name::Value::Object(obj.clone()))
).map_err(#crate_name::InputValueError::propogate)?;
).map_err(#crate_name::InputValueError::propagate)?;
});
fields.push(ident);
@ -111,7 +111,7 @@ pub fn generate(object_args: &args::InputObject) -> GeneratorResult<TokenStream>
let #ident: #ty = {
match obj.get(#name) {
Some(value) => #crate_name::InputValueType::parse(Some(value.clone()))
.map_err(#crate_name::InputValueError::propogate)?,
.map_err(#crate_name::InputValueError::propagate)?,
None => #default,
}
};
@ -119,7 +119,7 @@ pub fn generate(object_args: &args::InputObject) -> GeneratorResult<TokenStream>
} else {
get_fields.push(quote! {
let #ident: #ty = #crate_name::InputValueType::parse(obj.get(#name).cloned())
.map_err(#crate_name::InputValueError::propogate)?;
.map_err(#crate_name::InputValueError::propagate)?;
});
}

View File

@ -122,8 +122,8 @@ impl<T: InputValueType> InputValueError<T> {
Self::new(format!(r#"Failed to parse "{}": {}"#, T::type_name(), msg))
}
/// Propogate the error message to a different type.
pub fn propogate<U: InputValueType>(self) -> InputValueError<U> {
/// Propagate the error message to a different type.
pub fn propagate<U: InputValueType>(self) -> InputValueError<U> {
InputValueError::new(format!(
r#"{} (occurred while parsing "{}")"#,
self.message,

View File

@ -24,7 +24,7 @@ impl ScalarType for ObjectId {
impl ScalarType for UtcDateTime {
fn parse(value: Value) -> InputValueResult<Self> {
<DateTime<Utc>>::parse(value)
.map_err(InputValueError::propogate)
.map_err(InputValueError::propagate)
.map(UtcDateTime::from)
}

View File

@ -16,7 +16,7 @@ where
.into_iter()
.map(|(name, value)| Ok((name.into_string(), T::parse(Some(value))?)))
.collect::<Result<_, _>>()
.map_err(InputValueError::propogate),
.map_err(InputValueError::propagate),
_ => Err(InputValueError::expected_type(value)),
}
}

View File

@ -16,7 +16,7 @@ where
.into_iter()
.map(|(name, value)| Ok((name.into_string(), T::parse(Some(value))?)))
.collect::<Result<_, _>>()
.map_err(InputValueError::propogate),
.map_err(InputValueError::propagate),
_ => Err(InputValueError::expected_type(value)),
}
}

View File

@ -29,11 +29,11 @@ impl<T: InputValueType + Ord> InputValueType for BTreeSet<T> {
.into_iter()
.map(|value| InputValueType::parse(Some(value)))
.collect::<Result<_, _>>()
.map_err(InputValueError::propogate),
.map_err(InputValueError::propagate),
value => Ok({
let mut result = Self::default();
result.insert(
InputValueType::parse(Some(value)).map_err(InputValueError::propogate)?,
InputValueType::parse(Some(value)).map_err(InputValueError::propagate)?,
);
result
}),

View File

@ -31,11 +31,11 @@ impl<T: InputValueType + Hash + Eq> InputValueType for HashSet<T> {
.into_iter()
.map(|value| InputValueType::parse(Some(value)))
.collect::<Result<_, _>>()
.map_err(InputValueError::propogate),
.map_err(InputValueError::propagate),
value => Ok({
let mut result = Self::default();
result.insert(
InputValueType::parse(Some(value)).map_err(InputValueError::propogate)?,
InputValueType::parse(Some(value)).map_err(InputValueError::propagate)?,
);
result
}),

View File

@ -29,11 +29,11 @@ impl<T: InputValueType> InputValueType for LinkedList<T> {
.into_iter()
.map(|value| InputValueType::parse(Some(value)))
.collect::<Result<_, _>>()
.map_err(InputValueError::propogate),
.map_err(InputValueError::propagate),
value => Ok({
let mut result = Self::default();
result.push_front(
InputValueType::parse(Some(value)).map_err(InputValueError::propogate)?,
InputValueType::parse(Some(value)).map_err(InputValueError::propagate)?,
);
result
}),

View File

@ -28,9 +28,9 @@ impl<T: InputValueType> InputValueType for Vec<T> {
.into_iter()
.map(|value| InputValueType::parse(Some(value)))
.collect::<Result<_, _>>()
.map_err(InputValueError::propogate),
.map_err(InputValueError::propagate),
value => Ok(vec![
InputValueType::parse(Some(value)).map_err(InputValueError::propogate)?
InputValueType::parse(Some(value)).map_err(InputValueError::propagate)?
]),
}
}

View File

@ -29,11 +29,11 @@ impl<T: InputValueType> InputValueType for VecDeque<T> {
.into_iter()
.map(|value| InputValueType::parse(Some(value)))
.collect::<Result<_, _>>()
.map_err(InputValueError::propogate),
.map_err(InputValueError::propagate),
value => Ok({
let mut result = Self::default();
result.push_back(
InputValueType::parse(Some(value)).map_err(InputValueError::propogate)?,
InputValueType::parse(Some(value)).map_err(InputValueError::propagate)?,
);
result
}),

View File

@ -25,7 +25,7 @@ impl<T: InputValueType> InputValueType for Option<T> {
match value.unwrap_or_default() {
Value::Null => Ok(None),
value => Ok(Some(
T::parse(Some(value)).map_err(InputValueError::propogate)?,
T::parse(Some(value)).map_err(InputValueError::propagate)?,
)),
}
}

View File

@ -130,7 +130,7 @@ impl<T: InputValueType> InputValueType for MaybeUndefined<T> {
None => Ok(MaybeUndefined::Undefined),
Some(Value::Null) => Ok(MaybeUndefined::Null),
Some(value) => Ok(MaybeUndefined::Value(
T::parse(Some(value)).map_err(InputValueError::propogate)?,
T::parse(Some(value)).map_err(InputValueError::propagate)?,
)),
}
}