Merge pull request #55 from eminence/xml_1

Update to the v1 of the xml crate (previously known as xml-rs)

Author: eminence

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xmltree"
-version = "0.11.0"
+version = "0.12.0"
 authors = ["Andrew Chin <achin@eminence32.net>"]
 description = "Parse an XML file into a simple tree-like structure"
 documentation = "https://docs.rs/xmltree/"
@@ -12,7 +12,7 @@ categories = ["parsing", "data-structures"]
 edition = "2018"
 
 [dependencies]
-xml-rs = "0.8"
+xml = "1"
 indexmap = { version = "2", optional = true }
 
 [features]

README.md

@@ -15,7 +15,7 @@ Add the following to your `Cargo.toml` file:
 
 ```toml
 [dependencies]
-xmltree = "0.11"
+xmltree = "0.12"
 ```
 
 ### Feature-flags
@@ -24,14 +24,15 @@ xmltree = "0.11"
 
 * `attribute-sorted` - change the data structure that stores attributes to one that uses sorted order. This changes the type definition.
 
-## Compatibility with xml-rs
-This crate will export some types from the xml-rs crate.  If your own crate also uses the xml-rs
+## Compatibility with xml crate
+This crate will export some types from the [xml](https://crates.io/crates/xml) crate.  If your own crate also uses the xml
 crate, but with a different version, the types may be incompatible.  One way to solve this is to
 only use the exported types, but sometimes that is not always possible.  In those cases you should
-use a version of xmltree that matches the version of xml-rs you are using:
+use a version of xmltree that matches the version of xml you are using:
 
-| xml-rs version | xmltree version |
+| xml version    | xmltree version |
 |----------------|-----------------|
+| 1              | 0.12            |
 | 0.8            | 0.11            |
 | 0.7            | 0.8             |
 | 0.6            | 0.6             |

src/lib.rs

@@ -241,6 +241,7 @@ fn build<B: Read>(reader: &mut EventReader<B>, mut elem: Element) -> Result<Elem
             Ok(XmlEvent::StartDocument { .. }) | Ok(XmlEvent::EndDocument) => {
                 return Err(ParseError::CannotParse)
             }
+            Ok(XmlEvent::Doctype { .. }) => (),
             Err(e) => return Err(ParseError::MalformedXml(e)),
         }
     }
@@ -315,6 +316,7 @@ impl Element {
                 }
                 Ok(XmlEvent::EndElement { .. }) => (),
                 Ok(XmlEvent::EndDocument) => return Ok(root_nodes),
+                Ok(XmlEvent::Doctype { .. }) => (),
                 Err(e) => return Err(ParseError::MalformedXml(e)),
             }
         }