From 252c6a897723cee0f1972ed9707e62066e3566c6 Mon Sep 17 00:00:00 2001 From: Ning Sun Date: Thu, 18 Jul 2019 23:57:12 +0800 Subject: [PATCH] (feat) switch back to std hashmap [#279] --- Cargo.toml | 1 - release.toml | 1 - src/context.rs | 6 ++---- src/lib.rs | 2 -- src/partial.rs | 2 +- src/registry.rs | 2 +- src/render.rs | 3 +-- src/template.rs | 3 +-- 8 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 174c4d7ba..99042a368 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,6 @@ serde_json = "1.0.39" regex = "1.0.3" lazy_static = "1.0.0" walkdir = { version = "2.2.3", optional = true } -hashbrown = { version = "0.5.0", features = ["serde"] } [dev-dependencies] env_logger = "0.6.0" diff --git a/release.toml b/release.toml index cd5a4385c..32c2ea583 100644 --- a/release.toml +++ b/release.toml @@ -5,4 +5,3 @@ pre-release-replacements = [ {file="CHANGELOG.md", search="ReleaseDate", replace="{{date}}"}, {file="src/lib.rs", search="https://docs.rs/handlebars/[a-z0-9\\.-]+", replace="https://docs.rs/handlebars/{{version}}"}, ] - diff --git a/src/context.rs b/src/context.rs index 5d90fc516..4f1db42c2 100644 --- a/src/context.rs +++ b/src/context.rs @@ -1,6 +1,5 @@ -use std::collections::VecDeque; +use std::collections::{HashMap, VecDeque}; -use hashbrown::HashMap; use pest::iterators::Pair; use pest::Parser; use serde::Serialize; @@ -300,9 +299,8 @@ fn join(segs: &VecDeque<&str>, sep: &str) -> String { mod test { use crate::context::{self, BlockParams, Context}; use crate::value::{self}; - use hashbrown::HashMap; use serde_json::value::Map; - use std::collections::VecDeque; + use std::collections::{HashMap, VecDeque}; #[derive(Serialize)] struct Address { diff --git a/src/lib.rs b/src/lib.rs index 8473b4268..256dc92ba 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -349,8 +349,6 @@ extern crate serde_json; #[cfg(not(feature = "no_dir_source"))] extern crate walkdir; -extern crate hashbrown; - pub use self::context::{BlockParams, Context}; pub use self::directives::DirectiveDef as DecoratorDef; pub use self::error::{RenderError, TemplateError, TemplateFileError, TemplateRenderError}; diff --git a/src/partial.rs b/src/partial.rs index 9801c77b2..f52582f27 100644 --- a/src/partial.rs +++ b/src/partial.rs @@ -1,4 +1,4 @@ -use hashbrown::HashMap; +use std::collections::HashMap; use serde_json::value::Value as Json; diff --git a/src/registry.rs b/src/registry.rs index c6d6c07cc..ea1ca2964 100644 --- a/src/registry.rs +++ b/src/registry.rs @@ -1,9 +1,9 @@ +use std::collections::HashMap; use std::fmt::{self, Debug, Formatter}; use std::fs::File; use std::io::prelude::*; use std::path::Path; -use hashbrown::HashMap; use serde::Serialize; use regex::{Captures, Regex}; diff --git a/src/render.rs b/src/render.rs index 14eaadf84..b8cec3a9c 100644 --- a/src/render.rs +++ b/src/render.rs @@ -1,10 +1,9 @@ use std::borrow::Borrow; -use std::collections::VecDeque; +use std::collections::{HashMap, VecDeque}; use std::fmt; use std::ops::Deref; use std::rc::Rc; -use hashbrown::HashMap; use serde_json::value::Value as Json; use crate::context::{self, BlockParamHolder, BlockParams, Context}; diff --git a/src/template.rs b/src/template.rs index 518b0ee52..a35a43a4c 100644 --- a/src/template.rs +++ b/src/template.rs @@ -1,4 +1,4 @@ -use std::collections::VecDeque; +use std::collections::{HashMap, VecDeque}; use std::convert::From; use std::iter::Peekable; @@ -7,7 +7,6 @@ use pest::error::LineColLocation; use pest::iterators::Pair; use pest::{Parser, Position}; -use hashbrown::HashMap; use serde_json::value::Value as Json; use std::str::FromStr;