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

return error instead of panic

Browse Source
This commit is contained in:
Marc-Antoine Arnaud 2018-11-05 16:53:00 +01:00
parent 04d87e24f0
commit e420a0a5ac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ use YaSerialize;
pub fn to_string<T: YaSerialize>(model: &T) -> Result<String, String> { pub fn to_string<T: YaSerialize>(model: &T) -> Result<String, String> {
let buf = Cursor::new(Vec::new()); let buf = Cursor::new(Vec::new());
let cursor = serialize_with_writer(model, buf).unwrap(); let cursor = serialize_with_writer(model, buf)?;
let data = str::from_utf8(cursor.get_ref()).expect("Found invalid UTF-8"); let data = str::from_utf8(cursor.get_ref()).expect("Found invalid UTF-8");
Ok(String::from(data)) Ok(String::from(data))
} }
@ -22,7 +22,7 @@ pub fn serialize_with_writer<W: Write, T: YaSerialize>(model: &T, writer: W) ->
pub fn to_string_content<T: YaSerialize>(model: &T) -> Result<String, String> { pub fn to_string_content<T: YaSerialize>(model: &T) -> Result<String, String> {
let buf = Cursor::new(Vec::new()); let buf = Cursor::new(Vec::new());
let cursor = serialize_with_writer_content(model, buf).unwrap(); let cursor = serialize_with_writer_content(model, buf)?;
let data = str::from_utf8(cursor.get_ref()).expect("Found invalid UTF-8"); let data = str::from_utf8(cursor.get_ref()).expect("Found invalid UTF-8");
Ok(String::from(data)) Ok(String::from(data))
} }