Skip to content
This repository was archived by the owner on Mar 25, 2024. It is now read-only.

Commit cfe758b

Browse files
authored
Merge pull request #189 from dtolnay/multide
Support multi-doc deserialization
2 parents 037519e + 2903742 commit cfe758b

2 files changed

Lines changed: 94 additions & 6 deletions

File tree

‎src/de.rs‎

Lines changed: 80 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use crate::error::{self, Error, ErrorImpl, Result};
12
use crate::path::Path;
2-
use crate::{error, Error, Result};
33
use serde::de::{
44
self, Deserialize, DeserializeOwned, DeserializeSeed, Expected, IgnoredAny as Ignore,
55
IntoDeserializer, Unexpected, Visitor,
@@ -10,7 +10,10 @@ use std::f64;
1010
use std::fmt;
1111
use std::io;
1212
use std::marker::PhantomData;
13+
use std::mem;
1314
use std::str;
15+
use std::sync::atomic::{AtomicUsize, Ordering};
16+
use std::sync::Arc;
1417
use yaml_rust::parser::{Event as YamlEvent, MarkedEventReceiver, Parser};
1518
use yaml_rust::scanner::{Marker, TScalarStyle, TokenType};
1619

@@ -23,6 +26,8 @@ enum Input<'a> {
2326
Str(&'a str),
2427
Slice(&'a [u8]),
2528
Read(Box<dyn io::Read + 'a>),
29+
Multidoc(Arc<Multidoc>),
30+
Fail(Arc<ErrorImpl>),
2631
}
2732

2833
impl<'a> Deserializer<'a> {
@@ -52,7 +57,23 @@ impl<'a> Deserializer<'a> {
5257
}
5358

5459
fn de<T>(self, f: impl FnOnce(&mut DeserializerFromEvents) -> Result<T>) -> Result<T> {
60+
if let Input::Multidoc(multidoc) = &self.input {
61+
let mut pos = multidoc.pos.load(Ordering::Relaxed);
62+
let t = f(&mut DeserializerFromEvents {
63+
events: &multidoc.loader.events,
64+
aliases: &multidoc.loader.aliases,
65+
pos: &mut pos,
66+
path: Path::Root,
67+
remaining_depth: 128,
68+
})?;
69+
multidoc.pos.store(pos, Ordering::Relaxed);
70+
return Ok(t);
71+
}
72+
5573
let loader = loader(self.input)?;
74+
if loader.events.is_empty() {
75+
return Err(error::end_of_stream());
76+
}
5677
let mut pos = 0;
5778
let t = f(&mut DeserializerFromEvents {
5879
events: &loader.events,
@@ -84,6 +105,8 @@ fn loader(input: Input) -> Result<Loader> {
84105
rdr.read_to_end(&mut buffer).map_err(error::io)?;
85106
Input2::Slice(&buffer)
86107
}
108+
Input::Multidoc(_) => unreachable!(),
109+
Input::Fail(err) => return Err(error::shared(err)),
87110
};
88111

89112
let input = match input {
@@ -97,10 +120,62 @@ fn loader(input: Input) -> Result<Loader> {
97120
aliases: BTreeMap::new(),
98121
};
99122
parser.load(&mut loader, true).map_err(error::scanner)?;
100-
if loader.events.is_empty() {
101-
Err(error::end_of_stream())
102-
} else {
103-
Ok(loader)
123+
Ok(loader)
124+
}
125+
126+
struct Multidoc {
127+
loader: Loader,
128+
pos: AtomicUsize,
129+
}
130+
131+
impl<'de> Iterator for Deserializer<'de> {
132+
type Item = Self;
133+
134+
fn next(&mut self) -> Option<Self> {
135+
match &self.input {
136+
Input::Multidoc(multidoc) => {
137+
let pos = multidoc.pos.load(Ordering::Relaxed);
138+
return if pos < multidoc.loader.events.len() {
139+
Some(Deserializer {
140+
input: Input::Multidoc(Arc::clone(multidoc)),
141+
})
142+
} else {
143+
None
144+
};
145+
}
146+
Input::Fail(err) => {
147+
return Some(Deserializer {
148+
input: Input::Fail(Arc::clone(err)),
149+
});
150+
}
151+
_ => {}
152+
}
153+
154+
let dummy = Input::Str("");
155+
let input = mem::replace(&mut self.input, dummy);
156+
match loader(input) {
157+
Ok(loader) => {
158+
let multidoc = Arc::new(Multidoc {
159+
loader,
160+
pos: AtomicUsize::new(0),
161+
});
162+
self.input = Input::Multidoc(Arc::clone(&multidoc));
163+
if multidoc.loader.events.is_empty() {
164+
None
165+
} else {
166+
Some(Deserializer {
167+
input: Input::Multidoc(multidoc),
168+
})
169+
}
170+
}
171+
Err(err) => {
172+
let fail = err.shared();
173+
self.input = Input::Fail(Arc::clone(&fail));
174+
Some(Deserializer {
175+
input: Input::Fail(fail),
176+
})
177+
}
178+
}
104179
}
105180
}
106181

‎src/error.rs‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ pub enum ErrorImpl {
3030
MoreThanOneDocument,
3131
RecursionLimitExceeded,
3232

33-
#[allow(dead_code)] // to be used for multi-doc deserialization
3433
Shared(Arc<ErrorImpl>),
3534
}
3635

@@ -135,6 +134,10 @@ pub(crate) fn recursion_limit_exceeded() -> Error {
135134
Error(Box::new(ErrorImpl::RecursionLimitExceeded))
136135
}
137136

137+
pub(crate) fn shared(shared: Arc<ErrorImpl>) -> Error {
138+
Error(Box::new(ErrorImpl::Shared(shared)))
139+
}
140+
138141
pub(crate) fn fix_marker(mut error: Error, marker: Marker, path: Path) -> Error {
139142
if let ErrorImpl::Message(_, none @ None) = error.0.as_mut() {
140143
*none = Some(Pos {
@@ -145,6 +148,16 @@ pub(crate) fn fix_marker(mut error: Error, marker: Marker, path: Path) -> Error
145148
error
146149
}
147150

151+
impl Error {
152+
pub(crate) fn shared(self) -> Arc<ErrorImpl> {
153+
if let ErrorImpl::Shared(err) = *self.0 {
154+
err
155+
} else {
156+
Arc::from(self.0)
157+
}
158+
}
159+
}
160+
148161
impl error::Error for Error {
149162
// TODO: deprecated, remove in next major version.
150163
fn description(&self) -> &str {

0 commit comments

Comments
 (0)