diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/serde/de.rs | 12 | ||||
| -rw-r--r-- | src/serde/mod.rs | 2 | ||||
| -rw-r--r-- | src/serde/ser.rs | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/serde/de.rs b/src/serde/de.rs index 72f2fab..58e0973 100644 --- a/src/serde/de.rs +++ b/src/serde/de.rs @@ -1,22 +1,22 @@ use serde_base::de; -use std::iter::Peekable; use std::fmt::Display; +use std::iter::Peekable; use {Error, PlistEvent, u64_option_to_usize}; macro_rules! expect { ($next:expr, $pat:pat) => { match $next { - Some(Ok(v@$pat)) => v, + Some(Ok(v @ $pat)) => v, None => return Err(Error::UnexpectedEof), - _ => return Err(event_mismatch_error()) + _ => return Err(event_mismatch_error()), } }; ($next:expr, $pat:pat => $save:expr) => { match $next { Some(Ok($pat)) => $save, None => return Err(Error::UnexpectedEof), - _ => return Err(event_mismatch_error()) + _ => return Err(event_mismatch_error()), } }; } @@ -26,9 +26,9 @@ macro_rules! try_next { match $next { Some(Ok(v)) => v, Some(Err(_)) => return Err(event_mismatch_error()), - None => return Err(Error::UnexpectedEof) + None => return Err(Error::UnexpectedEof), } - } + }; } fn event_mismatch_error() -> Error { diff --git a/src/serde/mod.rs b/src/serde/mod.rs index 734b629..2b2411c 100644 --- a/src/serde/mod.rs +++ b/src/serde/mod.rs @@ -8,8 +8,8 @@ use serde_base::de::{Deserialize, DeserializeOwned}; use serde_base::ser::Serialize; use std::io::{Read, Seek, Write}; -use Result; use EventReader; +use Result; use xml; pub fn deserialize<R: Read + Seek, T: DeserializeOwned>(reader: R) -> Result<T> { diff --git a/src/serde/ser.rs b/src/serde/ser.rs index 3a05296..f9cb5b3 100644 --- a/src/serde/ser.rs +++ b/src/serde/ser.rs @@ -1,8 +1,8 @@ use serde_base::ser; use std::fmt::Display; -use {Date, Error, EventWriter, PlistEvent}; use date::serde_impls::DATE_NEWTYPE_STRUCT_NAME; +use {Date, Error, EventWriter, PlistEvent}; impl ser::Error for Error { fn custom<T: Display>(msg: T) -> Self { |
