diff options
| author | Edward Barnard | 2018-10-06 20:01:40 +0100 |
|---|---|---|
| committer | Edward Barnard | 2018-10-06 20:01:40 +0100 |
| commit | a1ab2a2550ed444828a8c76aaa8861268faeca33 (patch) | |
| tree | eace93160ed18a0c6d0cebf191aed8346de99a94 /src/events | |
| parent | 283c38b493c30521a96fda253bcc11d7dd744328 (diff) | |
| download | rust-plist-a1ab2a2550ed444828a8c76aaa8861268faeca33.tar.bz2 | |
Use Error in fewer places.
Diffstat (limited to 'src/events')
| -rw-r--r-- | src/events/binary_reader.rs | 8 | ||||
| -rw-r--r-- | src/events/xml_reader.rs | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/events/binary_reader.rs b/src/events/binary_reader.rs index 81af922..6068545 100644 --- a/src/events/binary_reader.rs +++ b/src/events/binary_reader.rs @@ -165,7 +165,7 @@ impl<R: Read + Seek> BinaryReader<R> { } fn seek_to_object(&mut self, object_ref: u64) -> Result<u64, Error> { - let object_ref = u64_to_usize(object_ref)?; + let object_ref = u64_to_usize(object_ref).ok_or(Error::InvalidData)?; let offset = *self .object_offsets .get(object_ref) @@ -232,9 +232,9 @@ impl<R: Read + Seek> BinaryReader<R> { (0x3, 3) => { // Date. Seconds since 1/1/2001 00:00:00. let secs = self.reader.read_f64::<BigEndian>()?; - Some(Event::DateValue(Date::from_seconds_since_plist_epoch( - secs, - )?)) + Some(Event::DateValue( + Date::from_seconds_since_plist_epoch(secs).map_err(|()| Error::InvalidData)?, + )) } (0x4, n) => { // Data diff --git a/src/events/xml_reader.rs b/src/events/xml_reader.rs index 6bb9936..fb09864 100644 --- a/src/events/xml_reader.rs +++ b/src/events/xml_reader.rs @@ -74,11 +74,11 @@ impl<R: Read> XmlReader<R> { })) } "date" => { - return Some( - self.read_content(|s| { - Ok(Event::DateValue(Date::from_rfc3339(&s)?)) - }), - ) + return Some(self.read_content(|s| { + Ok(Event::DateValue( + Date::from_rfc3339(&s).map_err(|()| Error::InvalidData)?, + )) + })) } "integer" => { return Some(self.read_content(|s| match FromStr::from_str(&s) { |