Sulkta-OSS/rustypipe
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert: "fix: improve VecLogErr messages" (leads to infinite loop)

Browse source 
This reverts commit 3d1b31bdde.
This commit is contained in:
ThetaDev 2024-04-01 17:27:53 +02:00
parent 4e071808bf
commit 522e28b72e
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/serializer/vec_log_err.rs
View file

@ -20,6 +20,13 @@ where
where where
D: serde::Deserializer<'de>, D: serde::Deserializer<'de>,
{ {
#[derive(serde::Deserialize)]
#[serde(untagged)]
enum GoodOrError<T> {
Good(T),
Error(serde_json::Value),
}
struct SeqVisitor<T>(PhantomData<T>); struct SeqVisitor<T>(PhantomData<T>);
impl<'de, T> Visitor<'de> for SeqVisitor<T> impl<'de, T> Visitor<'de> for SeqVisitor<T>
@ -39,14 +46,16 @@ where
let mut values = Vec::with_capacity(seq.size_hint().unwrap_or_default()); let mut values = Vec::with_capacity(seq.size_hint().unwrap_or_default());
let mut warnings = Vec::new(); let mut warnings = Vec::new();
loop { while let Some(value) = seq.next_element()? {
match seq.next_element::<T>() { match value {
Ok(val) => match val { GoodOrError::<T>::Good(value) => {
Some(val) => values.push(val), values.push(value);
None => break, }
}, GoodOrError::<T>::Error(value) => {
Err(e) => { warnings.push(format!(
warnings.push(format!("error deserializing item: {e}")); "error deserializing item: {}",
serde_json::to_string(&value).unwrap_or_default()
));
} }
} }
} }
@ -177,8 +186,8 @@ mod tests {
insta::assert_debug_snapshot!(res.items.warnings, @r###" insta::assert_debug_snapshot!(res.items.warnings, @r###"
[ [
"error deserializing item: missing field `name` at line 1 column 40", "error deserializing item: {\"xyz\":\"i2\"}",
"error deserializing item: missing field `name` at line 1 column 73", "error deserializing item: {\"namra\":\"i4\"}",
] ]
"###); "###);
} }