NationTech/yaserde
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/djrodgerspryor/yaserde into djrodgerspryor-master

Browse Source
This commit is contained in:
Marc-Antoine Arnaud 2021-02-08 11:39:57 +01:00
commit 0dc03c94ab
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
yaserde/src/ser/mod.rs
View File

@ -24,9 +24,9 @@ pub fn to_string_with_config<T: YaSerialize>(model: &T, config: &Config) -> Resu
pub fn serialize_with_writer<W: Write, T: YaSerialize>( pub fn serialize_with_writer<W: Write, T: YaSerialize>(
model: &T, model: &T,
writer: W, writer: W,
_config: &Config, config: &Config,
) -> Result<W, String> { ) -> Result<W, String> {
let mut serializer = Serializer::new_from_writer(writer); let mut serializer = Serializer::new_from_writer(writer, config);
match YaSerialize::serialize(model, &mut serializer) { match YaSerialize::serialize(model, &mut serializer) {
Ok(()) => Ok(serializer.into_inner()), Ok(()) => Ok(serializer.into_inner()),
Err(msg) => Err(msg), Err(msg) => Err(msg),
@ -67,10 +67,20 @@ impl<'de, W: Write> Serializer<W> {
} }
} }
pub fn new_from_writer(writer: W) -> Self { pub fn new_from_writer(writer: W, config: &Config) -> Self {
let config = EmitterConfig::new().cdata_to_characters(true); let mut emitter_config = EmitterConfig::new()
.cdata_to_characters(true)
.perform_indent(config.perform_indent)
.write_document_declaration(config.write_document_declaration);
Self::new(EventWriter::new_with_config(writer, config)) match &config.indent_string {
Some(indent_string_value) => {
emitter_config = emitter_config.indent_string(indent_string_value.clone());
}
_ => (),
}
Self::new(EventWriter::new_with_config(writer, emitter_config))
} }
pub fn new_for_inner(writer: W) -> Self { pub fn new_for_inner(writer: W) -> Self {