aboutsummaryrefslogtreecommitdiffstats
path: root/askama_shared
diff options
context:
space:
mode:
authorLibravatar Dirkjan Ochtman <dirkjan@ochtman.nl>2018-12-07 15:41:35 +0100
committerLibravatar Juan Aguilar <mhpoin@gmail.com>2018-12-08 21:43:20 +0100
commitd042c5d758a0b99288b99959d5d98462f18cde65 (patch)
tree76a3bc0744927ea976e94888e989dd96a417647f /askama_shared
parentcf8dc532f04440d5968265ee26852966c4a6c7b3 (diff)
downloadaskama-d042c5d758a0b99288b99959d5d98462f18cde65.tar.gz
askama-d042c5d758a0b99288b99959d5d98462f18cde65.tar.bz2
askama-d042c5d758a0b99288b99959d5d98462f18cde65.zip
Upgrade to 2018 edition
Diffstat (limited to 'askama_shared')
-rw-r--r--askama_shared/Cargo.toml1
-rw-r--r--askama_shared/src/filters/mod.rs2
-rw-r--r--askama_shared/src/lib.rs2
3 files changed, 3 insertions, 2 deletions
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;