Merge branch 'upgrade_quick_xml_0.12.1' into 'master'

Upgrade quick-xml to 0.12.1

See merge request lumi/minidom-rs!28

CHANGELOG.md

@@ -1,3 +1,6 @@
+Version 0.9.0, released 2018-04-10:
+  * Small changes
+    - Upgrade quick_xml to 0.12.1
 Version 0.8.0, released 2018-02-18:
   * Additions
     - Link Mauve replaced error\_chain with failure ( https://gitlab.com/lumi/minidom-rs/merge_requests/27 )

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "minidom"
-version = "0.8.0"
+version = "0.9.0"
 authors = [
   "lumi <lumi@pew.im>",
   "Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>",
@@ -20,6 +20,6 @@ license = "MIT"
 gitlab = { repository = "lumi/minidom-rs" }
 
 [dependencies]
-quick-xml = "0.11.0"
+quick-xml = "0.12.1"
 failure = "0.1.1"
 failure_derive = "0.1.1"

src/element.rs

@@ -9,8 +9,8 @@ use std::borrow::Cow;
 
 use error::{Error, Result};
 
-use quick_xml::reader::Reader as EventReader;
+use quick_xml::Reader as EventReader;
-use quick_xml::writer::Writer as EventWriter;
+use quick_xml::Writer as EventWriter;
 use quick_xml::events::{Event, BytesStart, BytesEnd, BytesText, BytesDecl};
 
 use std::io::BufRead;
@@ -126,11 +126,11 @@ impl Node {
         match *self {
             Node::Element(ref elmt) => elmt.write_to_inner(writer)?,
             Node::Text(ref s) => {
-                writer.write_event(Event::Text(BytesText::from_str(s)))?;
+                writer.write_event(Event::Text(BytesText::from_plain_str(s)))?;
                 ()
             },
             Node::Comment(ref s) => {
-                writer.write_event(Event::Comment(BytesText::from_str(s)))?;
+                writer.write_event(Event::Comment(BytesText::from_plain_str(s)))?;
                 ()
             },
         };

src/error.rs

@@ -7,7 +7,7 @@ use std::convert::From;
 pub enum Error {
     /// An error from quick_xml.
     #[fail(display = "XML error: {}", _0)]
-    XmlError(#[cause] ::quick_xml::errors::Error),
+    XmlError(#[cause] ::quick_xml::Error),
 
     /// An UTF-8 conversion error.
     #[fail(display = "UTF-8 error: {}", _0)]
@@ -30,8 +30,8 @@ pub enum Error {
     InvalidElement,
 }
 
-impl From<::quick_xml::errors::Error> for Error {
+impl From<::quick_xml::Error> for Error {
-    fn from(err: ::quick_xml::errors::Error) -> Error {
+    fn from(err: ::quick_xml::Error) -> Error {
         Error::XmlError(err)
     }
 }

src/tests.rs

@@ -1,6 +1,6 @@
 use std::iter::Iterator;
 
-use quick_xml::reader::Reader;
+use quick_xml::Reader;
 
 use element::Element;