diff options
| author | Edward Barnard | 2018-05-17 20:42:24 +0100 |
|---|---|---|
| committer | Edward Barnard | 2018-05-17 20:50:21 +0100 |
| commit | 4823636ef9002fa69a1df5e148e3dd156d17984d (patch) | |
| tree | f5bfeff54182584a3c791d7651f875ec396d7395 /src/events/mod.rs | |
| parent | 2af279c344a6a917ce4102fec82e6cba8cf8b37c (diff) | |
| download | rust-plist-4823636ef9002fa69a1df5e148e3dd156d17984d.tar.bz2 | |
Remove the Result<T, Error> type alias.
Diffstat (limited to 'src/events/mod.rs')
| -rw-r--r-- | src/events/mod.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/events/mod.rs b/src/events/mod.rs index b933ceb..cf5aa67 100644 --- a/src/events/mod.rs +++ b/src/events/mod.rs @@ -8,7 +8,7 @@ mod xml_writer; pub use self::xml_writer::XmlWriter; use std::io::{Read, Seek, SeekFrom}; -use {Date, Result}; +use {Date, Error}; /// An encoding of a plist as a flat structure. /// @@ -55,7 +55,7 @@ impl<R: Read + Seek> Reader<R> { Reader(ReaderInner::Uninitialized(Some(reader))) } - fn is_binary(reader: &mut R) -> Result<bool> { + fn is_binary(reader: &mut R) -> Result<bool, Error> { reader.seek(SeekFrom::Start(0))?; let mut magic = [0; 8]; reader.read_exact(&mut magic)?; @@ -66,9 +66,9 @@ impl<R: Read + Seek> Reader<R> { } impl<R: Read + Seek> Iterator for Reader<R> { - type Item = Result<Event>; + type Item = Result<Event, Error>; - fn next(&mut self) -> Option<Result<Event>> { + fn next(&mut self) -> Option<Result<Event, Error>> { let mut reader = match self.0 { ReaderInner::Xml(ref mut parser) => return parser.next(), ReaderInner::Binary(ref mut parser) => return parser.next(), @@ -91,5 +91,5 @@ impl<R: Read + Seek> Iterator for Reader<R> { } pub trait Writer { - fn write(&mut self, event: &Event) -> Result<()>; + fn write(&mut self, event: &Event) -> Result<(), Error>; } |
