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/lib.rs | |
| parent | 2af279c344a6a917ce4102fec82e6cba8cf8b37c (diff) | |
| download | rust-plist-4823636ef9002fa69a1df5e148e3dd156d17984d.tar.bz2 | |
Remove the Result<T, Error> type alias.
Diffstat (limited to 'src/lib.rs')
| -rw-r--r-- | src/lib.rs | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -88,8 +88,6 @@ pub use self::ser::{serialize_to_xml, Serializer}; use std::fmt; use std::io; -type Result<T> = ::std::result::Result<T, Error>; - #[derive(Debug)] pub enum Error { InvalidData, @@ -131,7 +129,7 @@ impl From<io::Error> for Error { } } -fn u64_to_usize(len_u64: u64) -> Result<usize> { +fn u64_to_usize(len_u64: u64) -> Result<usize, Error> { let len = len_u64 as usize; if len as u64 != len_u64 { return Err(Error::InvalidData); // Too long @@ -139,7 +137,7 @@ fn u64_to_usize(len_u64: u64) -> Result<usize> { Ok(len) } -fn u64_option_to_usize(len: Option<u64>) -> Result<Option<usize>> { +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), |
