aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Barnard2018-09-22 09:56:15 +0100
committerEdward Barnard2018-09-22 09:56:15 +0100
commit5f941fdb51a7505b4ffdc4ef6948360264e9fff5 (patch)
treed9d784cb6983dd084aabb0955a8f62dd90998380
parentf397ba3c601d79af969d25708690546f1d80c54e (diff)
downloadrust-plist-5f941fdb51a7505b4ffdc4ef6948360264e9fff5.tar.bz2
Document and rename methods on Value type.
-rw-r--r--src/lib.rs2
-rw-r--r--src/value.rs6
-rw-r--r--tests/fuzzer.rs2
3 files changed, 7 insertions, 3 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 1888173..97bbe7f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -24,7 +24,7 @@
//! use std::fs::File;
//!
//! let file = File::open("tests/data/xml.plist").unwrap();
-//! let plist = Value::read(file).unwrap();
+//! let plist = Value::from_reader(file).unwrap();
//!
//! match plist {
//! Value::Array(_array) => (),
diff --git a/src/value.rs b/src/value.rs
index bb89b4f..d27baba 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -4,6 +4,7 @@ use std::io::{Read, Seek};
use events::{Event, Reader};
use {u64_option_to_usize, Date, Error};
+/// Represents any plist value.
#[derive(Clone, Debug, PartialEq)]
pub enum Value {
Array(Vec<Value>),
@@ -17,11 +18,13 @@ pub enum Value {
}
impl Value {
- pub fn read<R: Read + Seek>(reader: R) -> Result<Value, Error> {
+ /// Reads a `Value` from a seekable byte stream.
+ pub fn from_reader<R: Read + Seek>(reader: R) -> Result<Value, Error> {
let reader = Reader::new(reader);
Value::from_events(reader)
}
+ /// Creates a `Value` from an event source.
pub fn from_events<T>(events: T) -> Result<Value, Error>
where
T: IntoIterator<Item = Result<Event, Error>>,
@@ -29,6 +32,7 @@ impl Value {
Builder::new(events.into_iter()).build()
}
+ /// Converts a `Value` into an `Event` stream.
pub fn into_events(self) -> Vec<Event> {
let mut events = Vec::new();
self.into_events_inner(&mut events);
diff --git a/tests/fuzzer.rs b/tests/fuzzer.rs
index 160bc53..0557999 100644
--- a/tests/fuzzer.rs
+++ b/tests/fuzzer.rs
@@ -61,7 +61,7 @@ fn issue_22_binary_with_byte_ref_size() {
fn test_fuzzer_data(data: &[u8]) -> Result<Value, Error> {
let cursor = Cursor::new(data);
- Value::read(cursor)
+ Value::from_reader(cursor)
}
fn test_fuzzer_data_ok(data: &[u8]) {