Modernize and simplify imports

2 files changed, 5 insertions, 10 deletions

diff --git a/askama_shared/Cargo.toml b/askama_shared/Cargo.toml
index 79a5a31..733416a 100644
--- a/askama_shared/Cargo.toml
+++ b/askama_shared/Cargo.toml
@@ -13,8 +13,7 @@ edition = "2018"
 askama_escape = { version = "0.2.0", path = "../askama_escape" }
 humansize = "1.1.0"
 num-traits = "0.2.6"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", optional = true }
 serde_yaml = { version = "0.8", optional = true }
 toml = "0.5"
diff --git a/askama_shared/src/lib.rs b/askama_shared/src/lib.rs
index 61def8a..87ec0aa 100644
--- a/askama_shared/src/lib.rs
+++ b/askama_shared/src/lib.rs
@@ -1,21 +1,17 @@
 #![cfg_attr(feature = "cargo-clippy", allow(unused_parens))]
-#[macro_use]
-extern crate serde_derive;
-
 use toml;
 
-use std::collections::HashSet;
+use std::collections::{BTreeMap, HashSet};
 use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
 
-mod error;
+use serde::Deserialize;
 
-pub use crate::error::{Error, Result};
 pub use askama_escape::MarkupDisplay;
 
-use std::collections::BTreeMap;
-
+mod error;
+pub use crate::error::{Error, Result};
 pub mod filters;
 pub mod helpers;