aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib.rs
diff options
context:
space:
mode:
authorEdward Barnard2018-10-06 20:01:40 +0100
committerEdward Barnard2018-10-06 20:01:40 +0100
commita1ab2a2550ed444828a8c76aaa8861268faeca33 (patch)
treeeace93160ed18a0c6d0cebf191aed8346de99a94 /src/lib.rs
parent283c38b493c30521a96fda253bcc11d7dd744328 (diff)
downloadrust-plist-a1ab2a2550ed444828a8c76aaa8861268faeca33.tar.bz2
Use Error in fewer places.
Diffstat (limited to 'src/lib.rs')
-rw-r--r--src/lib.rs13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/lib.rs b/src/lib.rs
index e1a0985..3178ee4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -129,17 +129,10 @@ impl From<io::Error> for Error {
}
}
-fn u64_to_usize(len_u64: u64) -> Result<usize, Error> {
+fn u64_to_usize(len_u64: u64) -> Option<usize> {
let len = len_u64 as usize;
if len as u64 != len_u64 {
- return Err(Error::InvalidData); // Too long
- }
- Ok(len)
-}
-
-fn u64_option_to_usize(len: Option<u64>) -> Result<Option<usize>, Error> {
- match len {
- Some(len) => Ok(Some(u64_to_usize(len)?)),
- None => Ok(None),
+ return None; // Too long
}
+ Some(len)
}