Merge pull request #98 from kaj/edition2018

Update ructe itself to edition 2018.

Author: kaj

CHANGELOG.md

@@ -12,6 +12,8 @@ project adheres to
 * Try to improve incremental compile times of projects using ructe by
   only writing fils if their contents actually changed. Also some code
   cleanup. PR #97.
+* Update ructe itself to use edition 2018 (it is still useable for
+  projects using both editios).  PR #98.
 * Update optional rsass dependency to 0.16.0.
 * Add optional support for tide 0.14 and 0.15.
 * Update gotham to 0.5 and axtix-web to 3.2 in examples.

Cargo.toml

@@ -9,6 +9,7 @@ readme = "README.md"
 keywords = ["web", "templating", "template", "html"]
 categories = ["template-engine", "web-programming"]
 license = "MIT/Apache-2.0"
+edition = "2018"
 
 [features]
 sass = ["rsass"]

src/expression.rs

@@ -1,11 +1,11 @@
+use crate::parseresult::PResult;
 use nom::branch::alt;
 use nom::bytes::complete::{escaped, is_a, is_not, tag};
 use nom::character::complete::{alpha1, char, digit1, none_of, one_of};
 use nom::combinator::{map, map_res, not, opt, recognize, value};
 use nom::error::context; //, VerboseError};
 use nom::multi::{fold_many0, many0, separated_list};
 use nom::sequence::{delimited, pair, preceded, terminated, tuple};
-use parseresult::PResult;
 use std::str::{from_utf8, Utf8Error};
 
 pub fn expression(input: &[u8]) -> PResult<&str> {
@@ -145,7 +145,7 @@ pub fn rust_comment(input: &[u8]) -> PResult<&[u8]> {
 
 #[cfg(test)]
 mod test {
-    use expression::expression;
+    use super::expression;
 
     #[test]
     fn expression_1() {

src/spacelike.rs

@@ -1,10 +1,10 @@
+use crate::parseresult::PResult;
 use nom::branch::alt;
 use nom::bytes::complete::{is_not, tag};
 use nom::character::complete::{multispace1, none_of};
 use nom::combinator::{map, value};
 use nom::multi::many0;
 use nom::sequence::preceded;
-use parseresult::PResult;
 
 pub fn spacelike(input: &[u8]) -> PResult<()> {
     map(many0(alt((comment, map(multispace1, |_| ())))), |_| ())(input)

src/template.rs

@@ -1,4 +1,8 @@
-use expression::{input_to_str, rust_name};
+use crate::expression::{input_to_str, rust_name};
+use crate::nom_delimited_list::delimited_list;
+use crate::parseresult::PResult;
+use crate::spacelike::spacelike;
+use crate::templateexpression::{template_expression, TemplateExpression};
 use itertools::Itertools;
 use nom::branch::alt;
 use nom::bytes::complete::is_not;
@@ -8,11 +12,7 @@ use nom::combinator::{map, map_res, opt, recognize};
 use nom::error::context;
 use nom::multi::{many0, many_till, separated_list};
 use nom::sequence::{delimited, preceded, terminated, tuple};
-use nom_delimited_list::delimited_list;
-use parseresult::PResult;
-use spacelike::spacelike;
 use std::io::{self, Write};
-use templateexpression::{template_expression, TemplateExpression};
 
 #[derive(Debug, PartialEq, Eq)]
 pub struct Template {
@@ -167,7 +167,7 @@ pub fn comma_type_expressions(input: &[u8]) -> PResult<()> {
 
 #[cfg(test)]
 mod test {
-    use template::type_expression;
+    use super::type_expression;
 
     #[test]
     fn tuple() {

src/templateexpression.rs

@@ -1,7 +1,9 @@
-use expression::{
+use crate::expression::{
     comma_expressions, expr_in_braces, expr_inside_parens, expression,
     input_to_str, rust_name,
 };
+use crate::parseresult::PResult;
+use crate::spacelike::{comment_tail, spacelike};
 use itertools::Itertools;
 use nom::branch::alt;
 use nom::bytes::complete::is_not;
@@ -11,8 +13,6 @@ use nom::combinator::{map, map_res, opt, recognize, value};
 use nom::error::context;
 use nom::multi::{many0, many_till, separated_list};
 use nom::sequence::{delimited, pair, preceded, terminated, tuple};
-use parseresult::PResult;
-use spacelike::{comment_tail, spacelike};
 use std::fmt::{self, Display};
 
 #[derive(Debug, PartialEq, Eq)]