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/value.rs | |
| parent | 283c38b493c30521a96fda253bcc11d7dd744328 (diff) | |
| download | rust-plist-a1ab2a2550ed444828a8c76aaa8861268faeca33.tar.bz2 | |
Use Error in fewer places.
Diffstat (limited to 'src/value.rs')
| -rw-r--r-- | src/value.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/value.rs b/src/value.rs index 237ecdf..59cc3d3 100644 --- a/src/value.rs +++ b/src/value.rs @@ -2,7 +2,7 @@ use std::collections::BTreeMap; use std::io::{Read, Seek}; use events::{Event, Reader}; -use {u64_option_to_usize, Date, Error}; +use {u64_to_usize, Date, Error}; /// Represents any plist value. #[derive(Clone, Debug, PartialEq)] @@ -403,8 +403,7 @@ impl<T: Iterator<Item = Result<Event, Error>>> Builder<T> { } fn build_array(&mut self, len: Option<u64>) -> Result<Vec<Value>, Error> { - let len = u64_option_to_usize(len)?; - let mut values = match len { + let mut values = match len.and_then(u64_to_usize) { Some(len) => Vec::with_capacity(len), None => Vec::new(), }; |
