Upgrade to 2018 edition

4 files changed, 13 insertions, 13 deletions

diff --git a/askama_derive/src/generator.rs b/askama_derive/src/generator.rs
index 128811a..dc1c551 100644
--- a/askama_derive/src/generator.rs
+++ b/askama_derive/src/generator.rs
@@ -1,7 +1,7 @@
 use super::{get_template_source, Context, Heritage};
-use input::TemplateInput;
-use parser::{Cond, Expr, MatchParameter, MatchVariant, Node, Target, When, WS};
-use shared::filters;
+use crate::input::TemplateInput;
+use crate::parser::{Cond, Expr, MatchParameter, MatchVariant, Node, Target, When, WS};
+use crate::shared::filters;
 
 use proc_macro2::Span;
 
@@ -13,7 +13,7 @@ use std::{cmp, hash, mem, str};
 
 use syn;
 
-use parser::parse;
+use crate::parser::parse;
 
 pub(crate) fn generate(
     input: &TemplateInput,
diff --git a/askama_derive/src/input.rs b/askama_derive/src/input.rs
index f4da43c..f79186d 100644
--- a/askama_derive/src/input.rs
+++ b/askama_derive/src/input.rs
@@ -2,7 +2,7 @@ use proc_macro2::TokenStream;
 
 use quote::ToTokens;
 
-use shared::{Config, Syntax};
+use crate::shared::{Config, Syntax};
 
 use std::path::PathBuf;
 
diff --git a/askama_derive/src/lib.rs b/askama_derive/src/lib.rs
index 5c84004..d6900d7 100644
--- a/askama_derive/src/lib.rs
+++ b/askama_derive/src/lib.rs
@@ -11,12 +11,12 @@ mod generator;
 mod input;
 mod parser;
 
-use input::{Print, Source, TemplateInput};
-use parser::{Expr, Macro, Node};
+use crate::input::{Print, Source, TemplateInput};
+use crate::parser::{Expr, Macro, Node};
+use crate::shared::{read_config_file, Config};
 use proc_macro::TokenStream;
-use shared::{read_config_file, Config};
 
-use parser::parse;
+use crate::parser::parse;
 use std::collections::HashMap;
 use std::fs;
 use std::path::{Path, PathBuf};
@@ -220,7 +220,7 @@ fn get_template_source(tpl_path: &Path) -> String {
 #[cfg(test)]
 mod tests {
     use super::get_template_source;
-    use Config;
+    use crate::Config;
 
     #[test]
     fn get_source() {
diff --git a/askama_derive/src/parser.rs b/askama_derive/src/parser.rs
index 742a7a2..08013e9 100644
--- a/askama_derive/src/parser.rs
+++ b/askama_derive/src/parser.rs
@@ -4,7 +4,7 @@
 use nom;
 use std::str;
 
-use shared::Syntax;
+use crate::shared::Syntax;
 
 #[derive(Debug)]
 pub enum Expr<'a> {
@@ -123,7 +123,7 @@ fn take_content<'a>(
     i: Input<'a>,
     s: &'a Syntax<'a>,
 ) -> Result<(Input<'a>, Node<'a>), nom::Err<Input<'a>>> {
-    use parser::ContentState::*;
+    use crate::parser::ContentState::*;
     let bs = s.block_start.as_bytes()[0];
     let be = s.block_start.as_bytes()[1];
     let cs = s.comment_start.as_bytes()[0];
@@ -771,7 +771,7 @@ pub fn parse<'a>(src: &'a str, syntax: &'a Syntax<'a>) -> Vec<Node<'a>> {
 
 #[cfg(test)]
 mod tests {
-    use shared::Syntax;
+    use crate::shared::Syntax;
 
     fn check_ws_split(s: &str, res: &(&str, &str, &str)) {
         let node = super::split_ws_parts(s.as_bytes());