diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72468faa528a78d3b5b33411a34ef48cf50e838a..f9d098f876e6b9b3c1cfd58658fe83135d370a77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+Version XXX, released YYY:
+  * Changes
+    * Update edition to 2018
 Version 0.11.1, released 2019-09-06:
   * Changes
     * Update to quick-xml 0.16
diff --git a/Cargo.toml b/Cargo.toml
index 204d729e3fd245b169dbd19a1650a0b8713d34b9..292b2e01c2eb7f6177bba6114ebc4c5237477cf4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,7 @@ documentation = "https://docs.rs/minidom"
 readme = "README.md"
 keywords = ["xml"]
 license = "MIT"
+edition = "2018"
 
 [badges]
 gitlab = { repository = "lumi/minidom-rs" }
diff --git a/src/element.rs b/src/element.rs
index 68d445e27641b4ae73a28f3b3725ad7772eff03e..08ccc709ecad30354909a673d5eefd9321c349a8 100644
--- a/src/element.rs
+++ b/src/element.rs
@@ -1,5 +1,10 @@
 //! Provides an `Element` type, which represents DOM nodes, and a builder to create them with.
 
+use crate::convert::IntoAttributeValue;
+use crate::error::{Error, Result};
+use crate::namespace_set::NamespaceSet;
+use crate::node::Node;
+
 use std::io:: Write;
 use std::collections::{btree_map, BTreeMap};
 
@@ -7,8 +12,6 @@ use std::str;
 use std::rc::Rc;
 use std::borrow::Cow;
 
-use error::{Error, Result};
-
 use quick_xml::Reader as EventReader;
 use quick_xml::Writer as EventWriter;
 use quick_xml::events::{Event, BytesStart, BytesEnd, BytesDecl};
@@ -19,10 +22,6 @@ use std::str::FromStr;
 
 use std::slice;
 
-use convert::IntoAttributeValue;
-use namespace_set::NamespaceSet;
-use node::Node;
-
 /// helper function to escape a `&[u8]` and replace all
 /// xml special characters (<, >, &, ', ") with their corresponding
 /// xml escaped value.
diff --git a/src/node.rs b/src/node.rs
index 56069d09f80f7a0960111a91914371389a00f717..e0d9a9ebbcf5dd3c2d68a879664491b042c07568 100644
--- a/src/node.rs
+++ b/src/node.rs
@@ -1,14 +1,13 @@
 //! Provides the `Node` struct, which represents a node in the DOM.
 
+use crate::element::{Element, ElementBuilder};
+use crate::error::Result;
+
 use std::io::Write;
 
 use quick_xml::Writer as EventWriter;
 use quick_xml::events::{Event, BytesText};
 
-use error::Result;
-
-use element::{Element, ElementBuilder};
-
 /// A node in an element tree.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Node {
diff --git a/src/tests.rs b/src/tests.rs
index 1ff37e6ccfb816ea41f89d4f67cfd08da8b641ca..046d8e5c817ac79febb208709c4f96b7671f8297 100644
--- a/src/tests.rs
+++ b/src/tests.rs
@@ -1,9 +1,7 @@
-use std::iter::Iterator;
+use crate::element::Element;
 
 use quick_xml::Reader;
 
-use element::Element;
-
 const TEST_STRING: &'static str = r#"<?xml version="1.0" encoding="utf-8"?><root xmlns="root_ns" a="b" xml:lang="en">meow<child c="d"/><child xmlns="child_ns" d="e" xml:lang="fr"/>nya</root>"#;
 
 fn build_test_tree() -> Element {
@@ -234,12 +232,12 @@ fn write_comments() {
 #[test]
 fn xml_error() {
     match "<a></b>".parse::<Element>() {
-        Err(::error::Error::XmlError(_)) => (),
+        Err(crate::error::Error::XmlError(_)) => (),
         err => panic!("No or wrong error: {:?}", err)
     }
 
     match "<a></".parse::<Element>() {
-        Err(::error::Error::XmlError(_)) => (),
+        Err(crate::error::Error::XmlError(_)) => (),
         err => panic!("No or wrong error: {:?}", err)
     }
 }
@@ -247,7 +245,7 @@ fn xml_error() {
 #[test]
 fn invalid_element_error() {
     match "<a:b:c>".parse::<Element>() {
-        Err(::error::Error::InvalidElement) => (),
+        Err(crate::error::Error::InvalidElement) => (),
         err => panic!("No or wrong error: {:?}", err)
     }
 }