Add indent flag to to json (first draft) (#4571)

* Add indent flag to `to json` (first draft)

* Run cargo fmt

* Update examples / tests

* Change order of examples
This commit is contained in:
Joseph T. Lyons
2022-02-20 17:29:19 -05:00
committed by GitHub
parent 9b2a022f5b
commit 5bf2ffeaf5
3 changed files with 84 additions and 17 deletions

View File

@ -2,7 +2,9 @@ pub use self::de::{
from_iter, from_reader, from_slice, from_str, Deserializer, StreamDeserializer,
};
pub use self::error::{Error, ErrorCode, Result};
pub use self::ser::{to_string, to_string_raw, to_vec, to_writer, Serializer};
pub use self::ser::{
to_string, to_string_raw, to_string_with_indent, to_vec, to_writer, Serializer,
};
pub use self::value::{from_value, to_value, Map, Value};
pub mod builder;

View File

@ -31,6 +31,11 @@ where
pub fn new(writer: W) -> Self {
Serializer::with_formatter(writer, HjsonFormatter::new())
}
#[inline]
pub fn with_indent(writer: W, indent: &'a [u8]) -> Self {
Serializer::with_formatter(writer, HjsonFormatter::with_indent(indent))
}
}
impl<W, F> Serializer<W, F>
@ -941,6 +946,19 @@ where
Ok(())
}
/// Encode the specified struct into a Hjson `[u8]` writer.
#[inline]
pub fn to_writer_with_indent<W, T>(writer: &mut W, value: &T, indent: usize) -> Result<()>
where
W: io::Write,
T: ser::Serialize,
{
let indent_string = " ".repeat(indent);
let mut ser = Serializer::with_indent(writer, indent_string.as_bytes());
value.serialize(&mut ser)?;
Ok(())
}
/// Encode the specified struct into a Hjson `[u8]` buffer.
#[inline]
pub fn to_vec<T>(value: &T) -> Result<Vec<u8>>
@ -954,6 +972,19 @@ where
Ok(writer)
}
/// Encode the specified struct into a Hjson `[u8]` buffer.
#[inline]
pub fn to_vec_with_indent<T>(value: &T, indent: usize) -> Result<Vec<u8>>
where
T: ser::Serialize,
{
// We are writing to a Vec, which doesn't fail. So we can ignore
// the error.
let mut writer = Vec::with_capacity(128);
to_writer_with_indent(&mut writer, value, indent)?;
Ok(writer)
}
/// Encode the specified struct into a Hjson `String` buffer.
#[inline]
pub fn to_string<T>(value: &T) -> Result<String>
@ -965,6 +996,17 @@ where
Ok(string)
}
/// Encode the specified struct into a Hjson `String` buffer.
#[inline]
pub fn to_string_with_indent<T>(value: &T, indent: usize) -> Result<String>
where
T: ser::Serialize,
{
let vec = to_vec_with_indent(value, indent)?;
let string = String::from_utf8(vec)?;
Ok(string)
}
/// Encode the specified struct into a Hjson `String` buffer.
/// And remove all whitespace
#[inline]