From d042c5d758a0b99288b99959d5d98462f18cde65 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Fri, 7 Dec 2018 15:41:35 +0100
Subject: Upgrade to 2018 edition

---
 askama_shared/Cargo.toml         | 1 +
 askama_shared/src/filters/mod.rs | 2 +-
 askama_shared/src/lib.rs         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'askama_shared')

diff --git a/askama_shared/Cargo.toml b/askama_shared/Cargo.toml
index 39ee358..f8fafe3 100644
--- a/askama_shared/Cargo.toml
+++ b/askama_shared/Cargo.toml
@@ -7,6 +7,7 @@ homepage = "https://github.com/djc/askama"
 repository = "https://github.com/djc/askama"
 license = "MIT/Apache-2.0"
 workspace = ".."
+edition = "2018"
 
 [dependencies]
 askama_escape = { version = "0.1.0", path = "../askama_escape" }
diff --git a/askama_shared/src/filters/mod.rs b/askama_shared/src/filters/mod.rs
index cf94092..0be9f95 100644
--- a/askama_shared/src/filters/mod.rs
+++ b/askama_shared/src/filters/mod.rs
@@ -10,8 +10,8 @@ mod json;
 #[cfg(feature = "serde_json")]
 pub use self::json::json;
 
+use crate::error::Error::Fmt;
 use askama_escape::MarkupDisplay;
-use error::Error::Fmt;
 use humansize::{file_size_opts, FileSize};
 use num_traits::cast::NumCast;
 use num_traits::Signed;
diff --git a/askama_shared/src/lib.rs b/askama_shared/src/lib.rs
index 07967f4..adb41b5 100644
--- a/askama_shared/src/lib.rs
+++ b/askama_shared/src/lib.rs
@@ -16,8 +16,8 @@ use std::path::{Path, PathBuf};
 
 mod error;
 
+pub use crate::error::{Error, Result};
 pub use askama_escape::MarkupDisplay;
-pub use error::{Error, Result};
 
 use std::collections::BTreeMap;
 
-- 
cgit