Improve bool parsing as XML can support also 0/1 value as bool (#88)

Improve bool parsing as XML can support also 0/1 value as bool

src/de/mod.rs

@@ -1,6 +1,6 @@
 use std::io::Read;
 
-use serde::de;
+use serde::de::{self, Unexpected};
 use xml::reader::{EventReader, ParserConfig, XmlEvent};
 use xml::name::OwnedName;
 
@@ -227,7 +227,25 @@ impl<'de, 'a, R: Read> de::Deserializer<'de> for &'a mut Deserializer<R> {
  deserialize_type!(deserialize_u64 => visit_u64);
  deserialize_type!(deserialize_f32 => visit_f32);
  deserialize_type!(deserialize_f64 => visit_f64);
- deserialize_type!(deserialize_bool => visit_bool);
+
+ fn deserialize_bool<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
+ if let XmlEvent::StartElement { .. } = *self.peek()? {
+ self.set_map_value()
+ }
+ self.read_inner_value::<V, V::Value, _>(|this| {
+ if let XmlEvent::EndElement { .. } = *this.peek()? {
+ return visitor.visit_bool(false);
+ }
+ expect!(this.next()?, XmlEvent::Characters(s) => {
+ match s.as_str() {
+ "true" | "1" => visitor.visit_bool(true),
+ "false" | "0" => visitor.visit_bool(false),
+ _ => Err(de::Error::invalid_value(Unexpected::Str(&s), &"a boolean")),
+ }
+
+ })
+ })
+ }
 
  fn deserialize_char<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
  self.deserialize_string(visitor)

tests/migrated.rs

@@ -69,6 +69,18 @@ where
  }
 }
 
+fn test_parse_invalid<'de, 'a, T>(errors: &[&'a str])
+where
+ T: PartialEq + Debug + ser::Serialize + de::Deserialize<'de>,
+{
+ for &s in errors {
+ assert!(match from_str::<T>(s) {
+ Err(Error(_, _)) => true,
+ _ => false,
+ });
+ }
+}
+
 #[test]
 fn test_namespaces() {
  let _ = simple_logger::init();
@@ -318,12 +330,17 @@ fn test_parse_u64() {
 
 #[test]
 fn test_parse_bool() {
+ let _ = simple_logger::init();
  test_parse_ok(&[
  ("<bla>true</bla>", true),
  ("<bla>false</bla>", false),
  ("<bla> true </bla>", true),
  ("<bla> false </bla>", false),
+ ("<bla>1</bla>", true),
+ ("<bla>0</bla>", false),
  ]);
+
+ test_parse_invalid::<bool>(&["<bla>verum</bla>"]);
 }
 
 #[test]