diff options
| author | Edward Barnard | 2017-02-22 10:28:39 +0000 |
|---|---|---|
| committer | Edward Barnard | 2017-02-22 10:28:39 +0000 |
| commit | ba0703033773605c2bcb06ee31014550d064c8d7 (patch) | |
| tree | cdd930e4508a3224e1fc2666f2f03d26585b0a1b /src/xml | |
| parent | 147672ce1f2d069b4c736fa4855769ba8bc040e7 (diff) | |
| download | rust-plist-ba0703033773605c2bcb06ee31014550d064c8d7.tar.bz2 | |
Rustfmt.
Diffstat (limited to 'src/xml')
| -rw-r--r-- | src/xml/reader.rs | 16 | ||||
| -rw-r--r-- | src/xml/writer.rs | 6 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/xml/reader.rs b/src/xml/reader.rs index d7ec99e..6af89b0 100644 --- a/src/xml/reader.rs +++ b/src/xml/reader.rs @@ -88,19 +88,15 @@ impl<R: Read> EventReader<R> { })) } "integer" => { - return Some(self.read_content(|s| { - match FromStr::from_str(&s) { - Ok(i) => Ok(PlistEvent::IntegerValue(i)), - Err(_) => Err(Error::InvalidData), - } + return Some(self.read_content(|s| match FromStr::from_str(&s) { + Ok(i) => Ok(PlistEvent::IntegerValue(i)), + Err(_) => Err(Error::InvalidData), })) } "real" => { - return Some(self.read_content(|s| { - match FromStr::from_str(&s) { - Ok(f) => Ok(PlistEvent::RealValue(f)), - Err(_) => Err(Error::InvalidData), - } + return Some(self.read_content(|s| match FromStr::from_str(&s) { + Ok(f) => Ok(PlistEvent::RealValue(f)), + Err(_) => Err(Error::InvalidData), })) } "string" => { diff --git a/src/xml/writer.rs b/src/xml/writer.rs index 400663d..9018e2d 100644 --- a/src/xml/writer.rs +++ b/src/xml/writer.rs @@ -85,7 +85,8 @@ impl<W: Write> EventWriter<W> { // If there are no more open tags then write the </plist> element if self.stack.len() == 1 { try!(self.end_element("plist")); - if let Some(Element::Root) = self.stack.pop() {} else { + if let Some(Element::Root) = self.stack.pop() { + } else { return Err(Error::InvalidData); } } @@ -140,7 +141,8 @@ impl<W: Write> PlistEventWriter for EventWriter<W> { } PlistEvent::EndArray => { try!(self.end_element("array")); - if let Some(Element::Array) = self.stack.pop() {} else { + if let Some(Element::Array) = self.stack.pop() { + } else { return Err(Error::InvalidData); } } |